summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2010-03-18 10:59:57 +0100
committerJiri Kosina <jkosina@suse.cz>2010-03-18 10:59:57 +0100
commite07b5d795aebbd7445cc98e8cd86b2c05fab07f8 (patch)
treefe4c482bf2a8356bf4e67a01df27a5c30ae1a727
parenta8d89807373f95f3f7637e3987710a4500a7a857 (diff)
downloadtalos-obmc-linux-e07b5d795aebbd7445cc98e8cd86b2c05fab07f8.tar.gz
talos-obmc-linux-e07b5d795aebbd7445cc98e8cd86b2c05fab07f8.zip
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>
-rw-r--r--MAINTAINERS6
1 files changed, 1 insertions, 5 deletions
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
OpenPOWER on IntegriCloud