v2.5.2.5 -> v2.5.2.6

- Asit Mallick: mtrr update
- Patrick Mochel: split up kernel/device.c into drivers/base
- Mikael Pettersson/Al Viro: fix missing in-core inode initialization
in ext2 introduced by Al's inode trimming
- David Miller: sparc and network updates
- Frank Davis: firewire video mmap page remapping fix
- me: fix configure help scripts to fix breakage noticed by Dave Jones
- Greg KH: USB updates
- Kai Germaschewski: ISDN fixes, Config.help entries
- Douglas Gilbert: SCSI doc update
- Ingo Molnar: x86 taskswitch optimizations, scheduler updates
- Mikael Pettersson: make APIC work on old external setups
- Al Viro: more inode trimming

1 files changed, 2 insertions, 2 deletions

diff --git a/kernel/Makefile b/kernel/Makefile
index c118fff175b8..34fdbca1730c 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -10,12 +10,12 @@
 O_TARGET := kernel.o
 
 export-objs = signal.o sys.o kmod.o context.o ksyms.o pm.o exec_domain.o \
-		printk.o device.o
+		printk.o 
 
 obj-y     = sched.o dma.o fork.o exec_domain.o panic.o printk.o \
 	    module.o exit.o itimer.o info.o time.o softirq.o resource.o \
 	    sysctl.o acct.o capability.o ptrace.o timer.o user.o \
-	    signal.o sys.o kmod.o context.o device.o
+	    signal.o sys.o kmod.o context.o 
 
 obj-$(CONFIG_UID16) += uid16.o
 obj-$(CONFIG_MODULES) += ksyms.o