---

yaml --- r: 48592 b: refs/heads/master c: e9e2cdb h: refs/heads/master v: v3
git-mirror · Feb 16, 2007 · a0d7647 · a0d7647
1 parent 974edcd
commit a0d7647
Show file tree

Hide file tree

Showing 18 changed files with 812 additions and 848 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 79bf2bb335b85db25d27421c798595a2fa2a0e82
+refs/heads/master: e9e2cdb412412326c4827fc78ba27f410d837e6e
diff --git a/trunk/arch/i386/Kconfig b/trunk/arch/i386/Kconfig
@@ -22,6 +22,14 @@ config CLOCKSOURCE_WATCHDOG
 	bool
 	default y
 
+config GENERIC_CLOCKEVENTS
+	bool
+	default y
+
+config GENERIC_CLOCKEVENTS_BROADCAST
+	bool
+	default y
+
 config LOCKDEP_SUPPORT
 	bool
 	default y

diff --git a/trunk/arch/i386/kernel/Makefile b/trunk/arch/i386/kernel/Makefile
@@ -32,7 +32,6 @@ obj-$(CONFIG_KPROBES)		+= kprobes.o
 obj-$(CONFIG_MODULES)		+= module.o
 obj-y				+= sysenter.o vsyscall.o
 obj-$(CONFIG_ACPI_SRAT) 	+= srat.o
-obj-$(CONFIG_HPET_TIMER) 	+= time_hpet.o
 obj-$(CONFIG_EFI) 		+= efi.o efi_stub.o
 obj-$(CONFIG_DOUBLEFAULT) 	+= doublefault.o
 obj-$(CONFIG_VM86)		+= vm86.o