--- kernel-source-2.4.21/drivers/ide/Makefile	2003-06-01 13:38:27.000000000 +0200
+++ ../linux-2.4.21/drivers/ide/Makefile	2003-06-13 16:51:33.000000000 +0200
@@ -8,6 +8,7 @@
 # In the future, some of these should be built conditionally.
 #
 
+O_TARGET := idedriver.o
 
 export-objs := ide-iops.o ide-taskfile.o ide-proc.o ide.o ide-probe.o ide-dma.o ide-lib.o setup-pci.o ide-io.o ide-disk.o
 
@@ -28,25 +29,24 @@
 
 # Core IDE code - must come before legacy
 
-ide-core-objs	:= ide-iops.o ide-taskfile.o ide.o ide-lib.o ide-io.o ide-default.o ide-proc.o
-ide-detect-objs	:= ide-probe.o ide-geometry.o
-
+obj-$(CONFIG_BLK_DEV_IDE)		+= ide-probe.o ide-geometry.o ide-iops.o ide-taskfile.o ide.o ide-lib.o ide-io.o ide-default.o
+obj-$(CONFIG_BLK_DEV_IDEDISK)		+= ide-disk.o
+obj-$(CONFIG_BLK_DEV_IDECD)		+= ide-cd.o
+obj-$(CONFIG_BLK_DEV_IDETAPE)		+= ide-tape.o
+obj-$(CONFIG_BLK_DEV_IDEFLOPPY)		+= ide-floppy.o
 
 ifeq ($(CONFIG_BLK_DEV_IDEPCI),y)
-ide-core-objs += setup-pci.o
+obj-$(CONFIG_BLK_DEV_IDE)		+= setup-pci.o
 endif
 ifeq ($(CONFIG_BLK_DEV_IDEDMA_PCI),y)
-ide-core-objs += ide-dma.o
+obj-$(CONFIG_BLK_DEV_IDE)		+= ide-dma.o
 endif
+obj-$(CONFIG_BLK_DEV_ISAPNP)		+= ide-pnp.o
 
-# Initialisation order:
-#	Core sets up
-#	Legacy drivers may register a callback
-#	Drivers are pre initialised
-#	Probe inits the drivers and driver callbacks
-#	Raid scans the devices
 
-obj-$(CONFIG_BLK_DEV_IDE)		+= ide-mod.o
+ifeq ($(CONFIG_BLK_DEV_IDE),y)
+obj-$(CONFIG_PROC_FS)			+= ide-proc.o
+endif
 
 ifeq ($(CONFIG_BLK_DEV_IDE),y)
   obj-y		+= legacy/idedriver-legacy.o
@@ -58,28 +58,10 @@
   endif
 endif
 
-obj-$(CONFIG_BLK_DEV_ISAPNP) 		+= ide-pnp.o
-
-obj-$(CONFIG_BLK_DEV_IDEDISK)		+= ide-disk.o
-obj-$(CONFIG_BLK_DEV_IDECD)		+= ide-cd.o
-obj-$(CONFIG_BLK_DEV_IDETAPE)		+= ide-tape.o
-obj-$(CONFIG_BLK_DEV_IDEFLOPPY)		+= ide-floppy.o
-
-obj-$(CONFIG_BLK_DEV_IDE) += ide-probe-mod.o
 
 ifeq ($(CONFIG_BLK_DEV_IDE),y)
 # RAID must be last of all
   obj-y		+= raid/idedriver-raid.o
 endif
 
-list-multi	:= ide-mod.o ide-probe-mod.o
-O_TARGET := idedriver.o
-
 include $(TOPDIR)/Rules.make
-
-ide-mod.o:	$(ide-core-objs)
-	$(LD) -r -o $@ $(ide-core-objs)
-
-ide-probe-mod.o:	$(ide-detect-objs)
-	$(LD) -r -o $@ $(ide-detect-objs)
-
--- kernel-source-2.4.21/drivers/ide/ide-io.c	2003-06-03 12:17:48.000000000 +0200
+++ ../linux-2.4.21/drivers/ide/ide-io.c	2003-06-13 16:51:33.000000000 +0200
@@ -896,8 +896,6 @@
 	ide_do_request(q->queuedata, IDE_NO_IRQ);
 }
 
-EXPORT_SYMBOL(do_ide_request);
-
 /*
  * un-busy the hwgroup etc, and clear any pending DMA status. we want to
  * retry the current request in pio mode instead of risking tossing it
--- kernel-source-2.4.21/drivers/ide/ide.c	2003-07-14 12:41:29.000000000 +0200
+++ ../linux-2.4.21/drivers/ide/ide.c	2003-06-13 16:51:33.000000000 +0200
@@ -1414,8 +1414,6 @@
 #endif		
 }
 
-EXPORT_SYMBOL(ide_add_generic_settings);
-
 /*
  * Delay for *at least* 50ms.  As we don't know how much time is left
  * until the next tick occurs, we wait an extra tick to be safe.
