From: Jiri Kosina <jkosina@suse.cz>
Date: Thu, 18 Mar 2010 09:59:57 +0000 (+0100)
Subject: hpet: x86_64 and i386 are not different code any more
X-Git-Tag: v2.6.35-rc1~482^2~34
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=e07b5d795aebbd7445cc98e8cd86b2c05fab07f8

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>
---

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