ixp4xx-kernel: Put required modules for usb storage back into the kernel.

2 files changed, 12 insertions, 11 deletions

diff --git a/packages/linux/ixp4xx-kernel/2.6.16/defconfig b/packages/linux/ixp4xx-kernel/2.6.16/defconfig
index 8548ed54b0..1b190e290d 100644
--- a/packages/linux/ixp4xx-kernel/2.6.16/defconfig
+++ b/packages/linux/ixp4xx-kernel/2.6.16/defconfig
@@ -593,13 +593,13 @@ CONFIG_ATA_OVER_ETH=m
 # SCSI device support
 #
 # CONFIG_RAID_ATTRS is not set
-CONFIG_SCSI=m
+CONFIG_SCSI=y
 CONFIG_SCSI_PROC_FS=y
 
 #
 # SCSI support type (disk, tape, CD-ROM)
 #
-CONFIG_BLK_DEV_SD=m
+CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=m
 # CONFIG_CHR_DEV_OSST is not set
 CONFIG_BLK_DEV_SR=m
@@ -637,7 +637,7 @@ CONFIG_ISCSI_TCP=m
 # CONFIG_MEGARAID_NEWGEN is not set
 # CONFIG_MEGARAID_LEGACY is not set
 # CONFIG_MEGARAID_SAS is not set
-CONFIG_SCSI_SATA=m
+CONFIG_SCSI_SATA=y
 # CONFIG_SCSI_SATA_AHCI is not set
 # CONFIG_SCSI_SATA_SVW is not set
 # CONFIG_SCSI_ATA_PIIX is not set
@@ -655,7 +655,7 @@ CONFIG_SCSI_SATA=m
 # CONFIG_SCSI_SATA_VITESSE is not set
 # CONFIG_SCSI_PATA_ALI is not set
 # CONFIG_SCSI_PATA_AMD is not set
-CONFIG_SCSI_PATA_ARTOP=m
+CONFIG_SCSI_PATA_ARTOP=y
 # CONFIG_SCSI_PATA_ATIIXP is not set
 # CONFIG_SCSI_PATA_CMD64X is not set
 # CONFIG_SCSI_PATA_CS5520 is not set
@@ -686,7 +686,7 @@ CONFIG_SCSI_PATA_ARTOP=m
 # CONFIG_SCSI_PATA_TRIFLEX is not set
 # CONFIG_SCSI_PATA_VIA is not set
 # CONFIG_SCSI_PATA_WINBOND is not set
-CONFIG_SCSI_PATA_IXP4XX=m
+CONFIG_SCSI_PATA_IXP4XX=y
 # CONFIG_SCSI_DMX3191D is not set
 # CONFIG_SCSI_FUTURE_DOMAIN is not set
 # CONFIG_SCSI_IPS is not set
@@ -1024,7 +1024,6 @@ CONFIG_I2C_IXP4XX=y
 # CONFIG_I2C_PARPORT_LIGHT is not set
 # CONFIG_I2C_PROSAVAGE is not set
 # CONFIG_I2C_SAVAGE4 is not set
-# CONFIG_SCx200_ACB is not set
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
@@ -1100,6 +1099,7 @@ CONFIG_HWMON=m
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_SIS5595 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47M192 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
 # CONFIG_SENSORS_VIA686A is not set
 # CONFIG_SENSORS_VT8231 is not set
@@ -1302,14 +1302,14 @@ CONFIG_USB_DEVICEFS=y
 #
 # USB Host Controller Drivers
 #
-CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_SPLIT_ISO=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 # CONFIG_USB_ISP116X_HCD is not set
-CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD=y
 # CONFIG_USB_OHCI_BIG_ENDIAN is not set
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_UHCI_HCD=m
+CONFIG_USB_UHCI_HCD=y
 # CONFIG_USB_SL811_HCD is not set
 
 #
@@ -1326,7 +1326,7 @@ CONFIG_USB_PRINTER=m
 #
 # may also be needed; see USB_STORAGE Help for more information
 #
-CONFIG_USB_STORAGE=m
+CONFIG_USB_STORAGE=y
 # CONFIG_USB_STORAGE_DEBUG is not set
 # CONFIG_USB_STORAGE_DATAFAB is not set
 # CONFIG_USB_STORAGE_FREECOM is not set
@@ -1484,6 +1484,7 @@ CONFIG_USB_EZUSB=y
 #
 # Real Time Clock
 #
+CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
diff --git a/packages/linux/ixp4xx-kernel_2.6.16.bb b/packages/linux/ixp4xx-kernel_2.6.16.bb
index ba9a2522f7..f2fad6b415 100644
--- a/packages/linux/ixp4xx-kernel_2.6.16.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.16.bb
@@ -3,7 +3,7 @@
 # Increment PR_CONFIG for changes to the ixp4xx-kernel specific
 # defconfig (do *NOT* increment anything in here for changes
 # to other kernel configs!)
-PR_CONFIG = "1"
+PR_CONFIG = "2"
 #
 # Increment the number below (i.e. the digits after PR) when
 # making changes within this file or for changes to the patches