From e07b5d795aebbd7445cc98e8cd86b2c05fab07f8 Mon Sep 17 00:00:00 2001
From: Jiri Kosina
Date: Thu, 18 Mar 2010 10:59:57 +0100
Subject: hpet: x86_64 and i386 are not different code any more

hpet implementation for x86_64 and i386 is unified. Reflect
this in MAINTAINERS.

Acked-by: Venkatesh Pallipadi <venki@google.com>
Acked-by: Vojtech Pavlik <vojtech@suse.cz>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
---
 MAINTAINERS | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'MAINTAINERS')

diff --git a/MAINTAINERS b/MAINTAINERS
index 01d6a98cd5d2..d8391a4820cb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2643,16 +2643,12 @@ F:	Documentation/timers/hpet.txt
 F:	drivers/char/hpet.c
 F:	include/linux/hpet.h
 
-HPET:	i386
+HPET:	x86
 M:	"Venkatesh Pallipadi (Venki)" <venki@google.com>
 S:	Maintained
 F:	arch/x86/kernel/hpet.c
 F:	arch/x86/include/asm/hpet.h
 
-HPET:	x86_64
-M:	Vojtech Pavlik <vojtech@suse.cz>
-S:	Maintained
-
 HPET:	ACPI
 M:	Bob Picco <bob.picco@hp.com>
 S:	Maintained
-- 
cgit v1.2.3-55-g7522