Merge http://linux-isdn.bkbits.net/linux-2.5.make

into home.transmeta.com:/home/torvalds/v2.5/linux

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 msr.o i386_ksyms.o time.o
+export-objs     := mca.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 \

arch/ia64/config.in

@@ -76,10 +76,6 @@ if [ "$CONFIG_IA64_SGI_SN1" = "y" -o "$CONFIG_IA64_SGI_SN2" = "y" ]; then
 	bool '  Enable SGI Medusa Simulator Support' CONFIG_IA64_SGI_SN_SIM
 	bool '  Enable autotest (llsc). Option to run cache test instead of booting' \
 			CONFIG_IA64_SGI_AUTOTEST
-	define_bool CONFIG_DEVFS_FS y
-	if [ "$CONFIG_DEVFS_FS" = "y" ]; then
-	  bool '    Enable DEVFS Debug Code' CONFIG_DEVFS_DEBUG
-	fi
 	bool '  Enable protocol mode for the L1 console' CONFIG_SERIAL_SGI_L1_PROTOCOL
 	define_bool CONFIG_DISCONTIGMEM y
 	define_bool CONFIG_IA64_MCA y

arch/m68k/hp300/Makefile

@@ -9,8 +9,6 @@
 
 O_TARGET := hp300.o
 
-export-objs	:= ksyms.o
-
 obj-y		:= ksyms.o config.o ints.o time.o reboot.o
 
 obj-$(CONFIG_VT)	+= hil.o

arch/m68k/sun3x/Makefile

@@ -9,6 +9,8 @@
 
 O_TARGET := sun3x.o
 
+export-objs	:= sun3x_ksyms.o
+
 obj-y		:= config.o time.o dvma.o prom.o
 
 include $(TOPDIR)/Rules.make

arch/mips/au1000/common/Makefile

@@ -8,6 +8,8 @@
 
 O_TARGET := au1000.o
 
+export-objs := serial.o
+
 obj-y := prom.o dbg_io.o int-handler.o irq.o puts.o time.o reset.o
 
 obj-$(CONFIG_AU1000_UART) += serial.o             

arch/ppc/amiga/Makefile

@@ -11,8 +11,6 @@
 
 O_TARGET := amiga.o
 
-export-objs	:= amiga_ksyms.o
-
 obj-y		:= config.o amiints.o cia.o time.o bootinfo.o amisound.o \
 			chipram.o amiga_ksyms.o
 

drivers/acpi/Config.in

@@ -32,7 +32,7 @@ if [ "$CONFIG_X86" = "y" ]; then
       tristate     '  Processor'	CONFIG_ACPI_PROCESSOR
       dep_tristate '  Thermal Zone' 	CONFIG_ACPI_THERMAL $CONFIG_ACPI_PROCESSOR
       if [ "$CONFIG_NUMA" = "y" ]; then
-        bool       '  NUMA support'     CONFIG_ACPI_NUMA $CONFIG_NUMA
+         dep_bool       '  NUMA support'     CONFIG_ACPI_NUMA $CONFIG_NUMA
       fi
       tristate     '  Toshiba Laptop Extras'	CONFIG_ACPI_TOSHIBA
       bool         '  Debug Statements'	CONFIG_ACPI_DEBUG
@@ -83,7 +83,7 @@ if [ "$CONFIG_IA64" = "y" ]; then
     tristate     '  Processor'		CONFIG_ACPI_PROCESSOR
     dep_tristate '  Thermal Zone'       CONFIG_ACPI_THERMAL $CONFIG_ACPI_PROCESSOR
     if [ "$CONFIG_NUMA" = "y" ]; then
-      bool       '  NUMA support'       CONFIG_ACPI_NUMA $CONFIG_NUMA
+       dep_bool       '  NUMA support'       CONFIG_ACPI_NUMA $CONFIG_NUMA
     fi
     bool         '  Debug Statements' 	CONFIG_ACPI_DEBUG
     endmenu

drivers/base/fs/Makefile

 obj-y		:= device.o bus.o driver.o class.o intf.o
 
-export-objs	:= device.o bus.o driver.o class.o intf.o
+export-objs	:= device.o bus.o driver.o class.o
 
 include $(TOPDIR)/Rules.make

drivers/block/Makefile

@@ -8,8 +8,8 @@
 # In the future, some of these should be built conditionally.
 #
 
-export-objs	:= elevator.o ll_rw_blk.o blkpg.o loop.o genhd.o \
-		   block_ioctl.o acsi.o
+export-objs	:= elevator.o ll_rw_blk.o loop.o genhd.o acsi.o \
+		   block_ioctl.o
 
 obj-y	:= elevator.o ll_rw_blk.o blkpg.o genhd.o block_ioctl.o
 

drivers/char/Makefile

@@ -12,10 +12,9 @@ obj-y	 += mem.o tty_io.o n_tty.o tty_ioctl.o pty.o misc.o random.o
 # All of the (potential) objects that export symbols.
 # This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
 
-export-objs     :=	busmouse.o console.o keyboard.o sysrq.o \
-			misc.o pty.o random.o selection.o \
-			sonypi.o tty_io.o tty_ioctl.o generic_serial.o rtc.o \
-			ip2main.o nvram.o
+export-objs     :=	busmouse.o console.o generic_serial.o ip2main.o \
+			ite_gpio.o misc.o nvram.o pty.o random.o rtc.o \
+			selection.o sonypi.o sysrq.o tty_io.o tty_ioctl.o
 
 obj-$(CONFIG_VT) += vt.o vc_screen.o consolemap.o consolemap_deftbl.o selection.o keyboard.o
 obj-$(CONFIG_HW_CONSOLE) += console.o defkeymap.o

drivers/char/ftape/lowlevel/Makefile

@@ -23,8 +23,6 @@
 #      driver for Linux.
 #
 
-export-objs := ftape_syms.o
-
 obj-$(CONFIG_FTAPE) += ftape.o
 
 ftape-objs := ftape-init.o fdc-io.o fdc-isr.o \

drivers/i2c/Makefile

@@ -3,7 +3,7 @@
 #
 
 export-objs	:= i2c-core.o i2c-algo-bit.o i2c-algo-pcf.o \
-		   i2c-algo-ite.o i2c-proc.o
+		   i2c-algo-ite.o i2c-proc.o i2c-algo-ibm_ocp.o
 
 obj-$(CONFIG_I2C)		+= i2c-core.o
 obj-$(CONFIG_I2C_CHARDEV)	+= i2c-dev.o

drivers/ide/Makefile

@@ -7,7 +7,7 @@
 # Note : at this point, these files are compiled on all systems.
 # In the future, some of these should be built conditionally.
 #
-export-objs		:= ide-taskfile.o ide.o ide-probe.o ataraid.o
+export-objs		:= ide-taskfile.o ide.o ide-probe.o
 
 obj-$(CONFIG_BLK_DEV_IDE)       += ide-mod.o ide-probe-mod.o
 obj-$(CONFIG_BLK_DEV_IDECS)     += ide-cs.o

drivers/message/i2o/Makefile

@@ -5,7 +5,7 @@
 # In the future, some of these should be built conditionally.
 #
 
-export-objs	:= i2o_pci.o i2o_core.o i2o_config.o i2o_block.o i2o_lan.o i2o_scsi.o i2o_proc.o
+export-objs	:= i2o_core.o
 
 obj-$(CONFIG_I2O_PCI)	+= i2o_pci.o
 obj-$(CONFIG_I2O)	+= i2o_core.o i2o_config.o

drivers/pcmcia/Makefile

@@ -2,7 +2,7 @@
 # Makefile for the kernel pcmcia subsystem (c/o David Hinds)
 #
 
-export-objs := ds.o cs.o yenta.o sa1100_pcmcia.o
+export-objs := ds.o cs.o yenta.o sa1100_generic.o
 
 obj-$(CONFIG_PCMCIA)			+= pcmcia_core.o ds.o
 ifeq ($(CONFIG_CARDBUS),y)

drivers/video/Makefile

@@ -6,12 +6,11 @@
 # This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
 
 export-objs    	:= fbmem.o fbcmap.o fbcon.o fbmon.o modedb.o \
-		   fbcon-afb.o fbcon-ilbm.o fbcon-accel.o \
-		   fbcon-vga.o fbcon-iplan2p2.o fbcon-iplan2p4.o \
+		   fbcon-afb.o fbcon-ilbm.o fbcon-accel.o cyber2000fb.o \
+		   fbcon-iplan2p2.o fbcon-iplan2p4.o fbgen.o \
 		   fbcon-iplan2p8.o fbcon-vga-planes.o fbcon-cfb16.o \
 		   fbcon-cfb2.o fbcon-cfb24.o fbcon-cfb32.o fbcon-cfb4.o \
-		   fbcon-cfb8.o fbcon-mfb.o fbcon-hga.o \
-		   cyber2000fb.o sa1100fb.o fbgen.o
+		   fbcon-cfb8.o fbcon-mfb.o fbcon-hga.o
 
 # Each configuration option enables a list of files.
 

fs/partitions/Makefile

@@ -2,7 +2,7 @@
 # Makefile for the linux kernel.
 #
 
-export-objs := check.o msdos.o
+export-objs := msdos.o
 
 obj-y := check.o
 

net/802/Makefile

@@ -2,7 +2,7 @@
 # Makefile for the Linux 802.x protocol layers.
 #
 
-export-objs		:= p8022.o psnap.o tr.o
+export-objs		:= p8022.o psnap.o
 
 obj-y			:= p8023.o
 

net/ipv4/netfilter/Makefile

@@ -2,7 +2,7 @@
 # Makefile for the netfilter modules on top of IPv4.
 #
 
-export-objs  := ip_conntrack_standalone.o ip_fw_compat.o ip_nat_standalone.o \
+export-objs  := ip_conntrack_standalone.o ip_nat_standalone.o \
 		ip_tables.o arp_tables.o
 
 # objects for the conntrack and NAT core (used by standalone and backw. compat)

net/ipx/Makefile

@@ -2,8 +2,6 @@
 # Makefile for the Linux IPX layer.
 #
 
-export-objs = af_ipx.o
-
 obj-$(CONFIG_IPX) += ipx.o
 
 ipx-y			:= af_ipx.o