Trivial: Consolidate HPET_TIMER Makefile entries

PATCH In review Deepak Saxena 2 participants 2 messages Aug 7, 2006

lore

Share & tools

lore

Deepak Saxena

author

2006-08-07 20:59 UTC #0 lore raw

PATCH 1/1 Trivial: Consolidate HPET_TIMER Makefile entries

Signed-off-by Deepak Saxena <[email protected]>

arch/i386/kernel/Makefile +1 -2

index ab98fc2..085b9fa 100644
@@ -32,12 +32,11 @@ 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
 obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
-obj-$(CONFIG_HPET_TIMER) 	+= hpet.o
+obj-$(CONFIG_HPET_TIMER) 	+= time_hpet.o hpet.o
 obj-$(CONFIG_K8_NB)		+= k8.o
 obj-$(CONFIG_AUDIT)		+= audit.o

Signature · 3 lines

Deepak Saxena - [email protected] - http://www.plexity.net

"An open heart has no possessions, only experiences" - Matt Bibbeau

Greg KH

2006-08-07 22:31 UTC #1 lore raw

Quoted 11 lines · Deepak Saxena

Signed-off-by Deepak Saxena <[email protected]>
arch/i386/kernel/Makefile +0 -0
index ab98fc2..085b9fa 100644
@@ -32,12 +32,11 @@ obj-$(CONFIG_KPROBES)		+= kprobes.o
 obj-$(CONFIG_MODULES)		+= module.o
 obj-y				+= sysenter.o vsyscall.o

arch/i386/kernel/Makefile obj-$(CONFIG_KPROBES) += kprobes.o · line 41

Quoted 10 lines

arch/i386/kernel/Makefile +1 -2

 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
 obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
-obj-$(CONFIG_HPET_TIMER) 	+= hpet.o
+obj-$(CONFIG_HPET_TIMER) 	+= time_hpet.o hpet.o
 obj-$(CONFIG_K8_NB)		+= k8.o
 obj-$(CONFIG_AUDIT)		+= audit.o

Is this necessary for 2.6.18-final? Are you sure that we don't need this for link order issues?

Care to use the trivial tree for this?

thanks,

greg k-h