Merge tp1.ruhr-uni-bochum.de:/home/kai/kernel/v2.5/linux-2.5

into tp1.ruhr-uni-bochum.de:/home/kai/kernel/v2.5/linux-2.5.make-fix

9 files changed, 11 insertions, 9 deletions

diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile
index 6af3e4f04e83..cf333bbeb083 100644
--- a/arch/i386/kernel/Makefile
+++ b/arch/i386/kernel/Makefile
@@ -6,7 +6,7 @@ EXTRA_TARGETS := kernel.o head.o init_task.o
 
 O_TARGET := kernel.o
 
-export-objs     := mca.o mtrr.o msr.o cpuid.o microcode.o i386_ksyms.o time.o
+export-objs     := mca.o mtrr.o i386_ksyms.o time.o
 
 obj-y	:= process.o semaphore.o signal.o entry.o traps.o irq.o vm86.o \
 		ptrace.o i8259.o ioport.o ldt.o setup.o time.o sys_i386.o \
diff --git a/arch/ia64/lib/Makefile b/arch/ia64/lib/Makefile
index 837a00718b08..ec05a65b7b30 100644
--- a/arch/ia64/lib/Makefile
+++ b/arch/ia64/lib/Makefile
@@ -4,7 +4,7 @@
 
 L_TARGET = lib.a
 
-export-objs := io.o swiotlb.o
+export-objs := swiotlb.o
 
 obj-y := __divsi3.o __udivsi3.o __modsi3.o __umodsi3.o					\
 	__divdi3.o __udivdi3.o __moddi3.o __umoddi3.o					\
diff --git a/arch/ia64/sn/io/Makefile b/arch/ia64/sn/io/Makefile
index bd34de5f56cd..1fa2f3e5390b 100644
--- a/arch/ia64/sn/io/Makefile
+++ b/arch/ia64/sn/io/Makefile
@@ -18,7 +18,7 @@ EXTRA_CFLAGS    := -DLITTLE_ENDIAN
 O_TARGET := sgiio.o
 
 ifeq ($(CONFIG_MODULES),y)
-export-objs = pciio.o hcl.o pci_dma.o
+export-objs = pciio.o hcl.o
 endif
 
 obj-y  := stubs.o sgi_if.o pciio.o xtalk.o xbow.o xswitch.o klgraph_hack.o \
diff --git a/arch/mips/baget/Makefile b/arch/mips/baget/Makefile
index ea5576631c5b..3f2ba192973b 100644
--- a/arch/mips/baget/Makefile
+++ b/arch/mips/baget/Makefile
@@ -5,7 +5,7 @@
 
 O_TARGET := baget.a
 
-export-objs		:= vacserial.o vacrtc.o
+export-objs		:= vacserial.o
 obj-y			:= baget.o print.o setup.o time.o irq.o bagetIRQ.o \
 			   reset.o wbflush.o
 obj-$(CONFIG_SERIAL)	+= vacserial.o
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile
index 9afbe4359e73..cce89b4697f1 100644
--- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@ -6,6 +6,7 @@
 
 O_TARGET	:= kernel.o
 EXTRA_TARGETS	:= head.o init_task.o
+export-objs	:= mips_ksyms.o
 
 obj-y				+= branch.o process.o signal.o entry.o \
 				   traps.o ptrace.o vm86.o ioport.o reset.o \
@@ -27,14 +28,12 @@ endif
 obj-$(CONFIG_SMP)		+= smp.o
 
 # Old style irq support, going to die in 2.5.
-export-objs			+= old-irq.o
 obj-$(CONFIG_NEW_IRQ)		+= irq.o
 obj-$(CONFIG_ROTTEN_IRQ)	+= old-irq.o
 obj-$(CONFIG_I8259)		+= i8259.o
 
 # transition from old time.c to new time.c
 # some boards uses old-time.c, some use time.c, and some use their own ones
-export-objs			+= old-time.o time.o
 obj-$(CONFIG_OLD_TIME_C)	+= old-time.o
 obj-$(CONFIG_NEW_TIME_C)	+= time.o
 
diff --git a/arch/ppc/8xx_io/Makefile b/arch/ppc/8xx_io/Makefile
index 73dcd28771ee..e84979f9993a 100644
--- a/arch/ppc/8xx_io/Makefile
+++ b/arch/ppc/8xx_io/Makefile
@@ -11,6 +11,8 @@
 
 O_TARGET 		:= 8xx_io.o
 
+export-objs		:= fec.o
+
 obj-y			:= commproc.o uart.o
 
 obj-$(CONFIG_FEC_ENET)	+= fec.o
diff --git a/arch/ppc64/kernel/Makefile b/arch/ppc64/kernel/Makefile
index d3021607968b..b477c9651fbe 100644
--- a/arch/ppc64/kernel/Makefile
+++ b/arch/ppc64/kernel/Makefile
@@ -9,7 +9,7 @@ KHEAD := head.o
 O_TARGET	:= kernel.o
 EXTRA_TARGETS	:= $(KHEAD)
 
-export-objs         := ppc_ksyms.o setup.o
+export-objs         := ppc_ksyms.o
 
 obj-y               :=	ppc_ksyms.o setup.o entry.o traps.o irq.o idle.o \
 			time.o process.o signal.o syscalls.o misc.o ptrace.o \
diff --git a/arch/sh/kernel/Makefile b/arch/sh/kernel/Makefile
index 7b86733fa6a8..868bb05af92c 100644
--- a/arch/sh/kernel/Makefile
+++ b/arch/sh/kernel/Makefile
@@ -5,7 +5,8 @@
 O_TARGET	:= kernel.o
 EXTRA_TARGETS	:= head.o init_task.o
 
-export-objs	:= io.o io_generic.o io_hd64461.o setup_hd64461.o sh_ksyms.o
+export-objs	:= io.o io_generic.o io_hd64465.o setup_hd64465.o sh_ksyms.o \
+		   io_adx.o io_bigsur.o io_cat68701.o hd64465_gpio.o
 
 obj-y	:= process.o signal.o entry.o traps.o irq.o irq_ipr.o \
 	ptrace.o setup.o time.o sys_sh.o semaphore.o \
diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile
index e151219cbc10..5ea32222c711 100644
--- a/arch/x86_64/kernel/Makefile
+++ b/arch/x86_64/kernel/Makefile
@@ -5,7 +5,7 @@
 O_TARGET	:= kernel.o
 EXTRA_TARGETS 	:= head.o head64.o init_task.o
 
-export-objs     := mtrr.o msr.o cpuid.o x8664_ksyms.o
+export-objs     := mtrr.o x8664_ksyms.o
 
 obj-y	:= process.o semaphore.o signal.o entry.o traps.o irq.o \
 		ptrace.o i8259.o ioport.o ldt.o setup.o time.o sys_x86_64.o \