The patch titled
remove arch/i386/kernel/time_hpet.c:hpet_reenable()
has been added to the -mm tree. Its filename is
updated-i386-convert-to-clock-event-devices-remove-arch-i386-kernel-time_hpetchpet_reenable.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: remove arch/i386/kernel/time_hpet.c:hpet_reenable()
From: Adrian Bunk <bunk@xxxxxxxxx>
Remove the no longer used hpet_reenable()
Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/i386/kernel/time_hpet.c | 5 -----
include/asm-i386/hpet.h | 1 -
2 files changed, 6 deletions(-)
diff -puN arch/i386/kernel/time_hpet.c~updated-i386-convert-to-clock-event-devices-remove-arch-i386-kernel-time_hpetchpet_reenable arch/i386/kernel/time_hpet.c
--- a/arch/i386/kernel/time_hpet.c~updated-i386-convert-to-clock-event-devices-remove-arch-i386-kernel-time_hpetchpet_reenable
+++ a/arch/i386/kernel/time_hpet.c
@@ -221,11 +221,6 @@ int __init hpet_enable(void)
return 0;
}
-int hpet_reenable(void)
-{
- return hpet_timer_stop_set_go(hpet_tick);
-}
-
int is_hpet_enabled(void)
{
return use_hpet;
diff -puN include/asm-i386/hpet.h~updated-i386-convert-to-clock-event-devices-remove-arch-i386-kernel-time_hpetchpet_reenable include/asm-i386/hpet.h
--- a/include/asm-i386/hpet.h~updated-i386-convert-to-clock-event-devices-remove-arch-i386-kernel-time_hpetchpet_reenable
+++ a/include/asm-i386/hpet.h
@@ -96,7 +96,6 @@ extern int hpet_use_timer;
extern int hpet_rtc_timer_init(void);
extern int hpet_enable(void);
-extern int hpet_reenable(void);
extern int is_hpet_enabled(void);
extern int is_hpet_capable(void);
extern int hpet_readl(unsigned long a);
_
Patches currently in -mm which might be from bunk@xxxxxxxxx are
origin.patch
git-alsa.patch
git-gfs2-nmw.patch
git-mtd.patch
git-net.patch
git-pcmcia.patch
git-scsi-misc.patch
drivers-scsi-small-cleanups.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch
drivers-scsi-advansysc-cleanups.patch
megaraid-fix-warnings-when-config_proc_fs=n.patch
drivers-scsi-dpt_i2oc-remove-dead-code.patch
acx1xx-wireless-driver.patch
drivers-edac-make-code-static.patch
ext4_ext_split-remove-dead-code.patch
the-scheduled-removal-of-some-oss-options.patch
fs-reiser4-possible-cleanups.patch
reiser4-possible-cleanups-2.patch
gtod-persistent-clock-support-i386-i386-unexport-read_persistent_clock.patch
updated-i386-convert-to-clock-event-devices-arch-i386-kernel-apicc-make-a-function-static.patch
updated-i386-convert-to-clock-event-devices-remove-arch-i386-kernel-time_hpetchpet_reenable.patch
slab-cache-shrinker-statistics.patch
debug-shared-irqs-kconfig-fix.patch
i386-enable-4k-stacks-by-default.patch
mutex-subsystem-synchro-test-module.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
