Make sure ide init happens in the right order

drivers/ide/Makefile

@@ -19,21 +19,26 @@ ide-obj-y	:=
 subdir-$(CONFIG_BLK_DEV_IDEPCI)	+= pci
 subdir-$(CONFIG_BLK_DEV_IDE) += legacy ppc arm pci
 
+# First come modules that register themselves with the core
+obj-y		+=	pci/idedriver-pci.o
+
+# Core IDE code - must come before legacy
+
 obj-$(CONFIG_BLK_DEV_IDE)		+= ide-probe.o ide-geometry.o ide-iops.o ide-taskfile.o ide.o ide-lib.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_IDEPCI)		+= setup-pci.o
 obj-$(CONFIG_BLK_DEV_IDEDMA_PCI)	+= ide-dma.o
 obj-$(CONFIG_BLK_DEV_ISAPNP)		+= ide-pnp.o
 
+ifeq ($(CONFIG_BLK_DEV_IDE),y)
 obj-$(CONFIG_PROC_FS)                  += ide-proc.o
-
-obj-$(CONFIG_BLK_DEV_IDEPCI)		+= setup-pci.o
+endif
 
 ifeq ($(CONFIG_BLK_DEV_IDE),y)
-  obj-y		+= pci/idedriver-pci.o
   obj-y		+= legacy/idedriver-legacy.o
   obj-y		+= ppc/idedriver-ppc.o
   obj-y		+= arm/idedriver-arm.o

drivers/ide/legacy/Makefile

@@ -19,6 +19,7 @@ obj-$(CONFIG_BLK_DEV_Q40IDE)		+= q40ide.o
 
 obj-$(CONFIG_BLK_DEV_IDECS)		+= ide-cs.o
 
+# Last of all
 obj-$(CONFIG_BLK_DEV_HD)		+= hd.o
 
 EXTRA_CFLAGS	:= -I../

drivers/ide/pci/Makefile

@@ -12,7 +12,6 @@ obj-$(CONFIG_BLK_DEV_CMD640)		+= cmd640.o
 obj-$(CONFIG_BLK_DEV_CMD64X)		+= cmd64x.o
 obj-$(CONFIG_BLK_DEV_CS5530)		+= cs5530.o
 obj-$(CONFIG_BLK_DEV_CY82C693)		+= cy82c693.o
-obj-$(CONFIG_BLK_DEV_GENERIC)		+= generic.o
 obj-$(CONFIG_BLK_DEV_HPT34X)		+= hpt34x.o
 obj-$(CONFIG_BLK_DEV_HPT366)		+= hpt366.o
 #obj-$(CONFIG_BLK_DEV_HPT37X)		+= hpt37x.o
@@ -34,6 +33,9 @@ obj-$(CONFIG_BLK_DEV_SLC90E66)		+= slc90e66.o
 obj-$(CONFIG_BLK_DEV_TRM290)		+= trm290.o
 obj-$(CONFIG_BLK_DEV_VIA82CXXX)		+= via82cxxx.o
 
+# Must appear at the end of the block
+obj-$(CONFIG_BLK_DEV_GENERIC)          += generic.o
+
 EXTRA_CFLAGS	:= -I../
 
 include $(TOPDIR)/Rules.make