Index: target/linux/x86-2.6/config/default
===================================================================
--- target/linux/x86-2.6/config/default	(revision 6529)
+++ target/linux/x86-2.6/config/default	(working copy)
@@ -19,6 +19,9 @@
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 # CONFIG_ARLAN is not set
 # CONFIG_AT1700 is not set
+CONFIG_ATA=m
+# CONFIG_ATA_GENERIC is not set
+CONFIG_ATA_PIIX=m
 # CONFIG_B44 is not set
 CONFIG_BASE_SMALL=0
 # CONFIG_BINFMT_AOUT is not set
@@ -267,6 +270,42 @@
 CONFIG_NSC_GPIO=m
 CONFIG_NVRAM=y
 CONFIG_PAGE_OFFSET=0xC0000000
+# CONFIG_PATA_ALI is not set
+# CONFIG_PATA_AMD is not set
+# CONFIG_PATA_ARTOP is not set
+# CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CS5520 is not set
+# CONFIG_PATA_CS5530 is not set
+# CONFIG_PATA_CS5535 is not set
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+# CONFIG_PATA_HPT366 is not set
+# CONFIG_PATA_HPT37X is not set
+# CONFIG_PATA_HPT3X2N is not set
+# CONFIG_PATA_HPT3X3 is not set
+# CONFIG_PATA_ISAPNP is not set
+# CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_JMICRON is not set
+# CONFIG_PATA_LEGACY is not set
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_NETCELL is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_OPTI is not set
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PDC2027X is not set
+# CONFIG_PATA_PDC_OLD is not set
+# CONFIG_PATA_QDI is not set
+# CONFIG_PATA_RADISYS is not set
+# CONFIG_PATA_RZ1000 is not set
+# CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_SIL680 is not set
+# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
 # CONFIG_PC8736x_GPIO is not set
 # CONFIG_PCIEPORTBUS is not set
 # CONFIG_PCIPCWATCHDOG is not set
@@ -279,6 +318,7 @@
 CONFIG_PCMCIA_ATMEL=m
 CONFIG_PCMCIA_PROBE=y
 # CONFIG_PCWATCHDOG is not set
+# CONFIG_PDC_ADMA is not set
 CONFIG_PHYSICAL_START=0x100000
 # CONFIG_PM is not set
 CONFIG_PNP=y
@@ -287,6 +327,20 @@
 # CONFIG_REGPARM is not set
 CONFIG_RTC=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+# CONFIG_SATA_AHCI is not set
+CONFIG_SATA_INTEL_COMBINED=y
+# CONFIG_SATA_MV is not set
+# CONFIG_SATA_NV is not set
+# CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_SIL is not set
+# CONFIG_SATA_SIL24 is not set
+# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_SVW is not set
+# CONFIG_SATA_SX4 is not set
+# CONFIG_SATA_ULI is not set
+# CONFIG_SATA_VIA is not set
+# CONFIG_SATA_VITESSE is not set
 # CONFIG_SBC8360_WDT is not set
 # CONFIG_SBC_EPX_C3_WATCHDOG is not set
 CONFIG_SC1200_WDT=m
@@ -303,6 +357,7 @@
 # CONFIG_SCSI_GENERIC_NCR5380 is not set
 # CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
 # CONFIG_SCSI_IN2000 is not set
+# CONFIG_SCSI_IPR is not set
 # CONFIG_SCSI_NCR53C406A is not set
 # CONFIG_SCSI_PAS16 is not set
 # CONFIG_SCSI_PSI240I is not set
Index: package/kernel/modules/usb.mk
===================================================================
--- package/kernel/modules/usb.mk	(revision 6529)
+++ package/kernel/modules/usb.mk	(working copy)
@@ -233,10 +233,9 @@
   DESCRIPTION:=Kernel support for USB Mass Storage devices
   KCONFIG:=$(CONFIG_USB_STORAGE)
   FILES:= \
-	$(MODULES_DIR)/kernel/drivers/scsi/scsi_mod.$(LINUX_KMOD_SUFFIX) \
-	$(MODULES_DIR)/kernel/drivers/scsi/sd_mod.$(LINUX_KMOD_SUFFIX) \
 	$(MODULES_DIR)/kernel/drivers/usb/storage/usb-storage.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,60,scsi_mod sd_mod usb-storage)
+  DEPENDS:=+kmod-scsi-core
 endef
 $(eval $(call KernelPackage,usb-storage))
 
Index: package/kernel/modules/block.mk
===================================================================
--- package/kernel/modules/block.mk	(revision 0)
+++ package/kernel/modules/block.mk	(revision 0)
@@ -0,0 +1,21 @@
+BLMENU:=Block Devices
+
+define KernelPackage/libata
+	TITLE:=libata
+	DESCRIPTION:=libata
+	KCONFIG:=$(CONFIG_ATA)
+	SUBMENU:=$(BLMENU)
+	FILES:=$(MODULES_DIR)/kernel/drivers/ata/libata.$(LINUX_KMOD_SUFFIX)
+endef
+$(eval $(call KernelPackage,libata))
+
+define KernelPackage/ata-piix
+	TITLE:=ata-piix
+	DESCRIPTION:=Kernel module for Intel PIIX SATA controller
+	KCONFIG:=$(CONFIG_ATA_PIIX)
+	SUBMENU:=$(BLMENU)
+	AUTOLOAD:=$(call AutoLoad,30,scsi_mod libata sd_mod ata_piix)
+	FILES:=$(MODULES_DIR)/kernel/drivers/ata/ata_piix.$(LINUX_KMOD_SUFFIX)
+	DEPENDS:=+kmod-libata +kmod-ide-core +kmod-scsi-core
+endef
+$(eval $(call KernelPackage,ata-piix))
Index: package/kernel/modules/other.mk
===================================================================
--- package/kernel/modules/other.mk	(revision 6529)
+++ package/kernel/modules/other.mk	(working copy)
@@ -73,6 +73,16 @@
 endef
 $(eval $(call KernelPackage,ide-aec62xx))
 
+define KernelPackage/scsi-core
+  TITLE:=Kernel support for SCSI
+  SUBMENU:=$(EMENU)
+  KCONFIG:=$(CONFIG_BLK_DEV_SD)
+  FILES:= \
+    $(MODULES_DIR)/kernel/drivers/scsi/scsi_mod.$(LINUX_KMOD_SUFFIX) \
+    $(MODULES_DIR)/kernel/drivers/scsi/sd_mod.$(LINUX_KMOD_SUFFIX)
+endef
+$(eval $(call KernelPackage,scsi-core))
+
 define KernelPackage/lp
   TITLE:=Parallel port and line printer support
   KCONFIG:=$(CONFIG_PARPORT)