diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-03-10 14:26:03 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-03-10 14:26:03 +0000 |
| commit | ba1212299e2a4b2b99c1d058660273eb92327490 (patch) | |
| tree | 8e7565e5518727f54c42bef89eadee972058deba | |
| parent | 54da6877f11a0c74b4e4a55ff0bade5cf3a7c5d8 (diff) | |
| parent | 5dfbb450f05b0ea1788466c0929ab2344c605b18 (diff) | |
merge of '1334e5973904d3ffb6bf8fc09ee4ee1f196f89d7'
and '23ad96f5be867b4f297808985a4d7ac90b8f15ea'
| -rw-r--r-- | packages/linux/ixp4xx-kernel/2.6.20/defconfig | 13 | ||||
| -rw-r--r-- | packages/linux/ixp4xx-kernel_2.6.20.bb | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/packages/linux/ixp4xx-kernel/2.6.20/defconfig b/packages/linux/ixp4xx-kernel/2.6.20/defconfig index c22f2d6ef7..f787d9d1dc 100644 --- a/packages/linux/ixp4xx-kernel/2.6.20/defconfig +++ b/packages/linux/ixp4xx-kernel/2.6.20/defconfig @@ -728,6 +728,7 @@ CONFIG_ISCSI_TCP=m # Serial ATA (prod) and Parallel ATA (experimental) drivers # CONFIG_ATA=m +# CONFIG_ATA_NONSTANDARD is not set # CONFIG_SATA_AHCI is not set # CONFIG_SATA_SVW is not set # CONFIG_ATA_PIIX is not set @@ -1604,6 +1605,18 @@ CONFIG_USB_SERIAL_GARMIN=m CONFIG_USB_SERIAL_IPW=m CONFIG_USB_SERIAL_KEYSPAN_PDA=m CONFIG_USB_SERIAL_KEYSPAN=m +CONFIG_USB_SERIAL_KEYSPAN_MPR=y +CONFIG_USB_SERIAL_KEYSPAN_USA28=y +CONFIG_USB_SERIAL_KEYSPAN_USA28X=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y +CONFIG_USB_SERIAL_KEYSPAN_USA19=y +CONFIG_USB_SERIAL_KEYSPAN_USA18X=y +CONFIG_USB_SERIAL_KEYSPAN_USA19W=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y +CONFIG_USB_SERIAL_KEYSPAN_USA49W=y +CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y CONFIG_USB_SERIAL_KLSI=m CONFIG_USB_SERIAL_KOBIL_SCT=m CONFIG_USB_SERIAL_MCT_U232=m diff --git a/packages/linux/ixp4xx-kernel_2.6.20.bb b/packages/linux/ixp4xx-kernel_2.6.20.bb index adcc2a1625..e67803098b 100644 --- a/packages/linux/ixp4xx-kernel_2.6.20.bb +++ b/packages/linux/ixp4xx-kernel_2.6.20.bb @@ -6,7 +6,7 @@ # http://trac.nslu2-linux.org/kernel/ # # The revision that is pulled from SVN is specified below -IXP4XX_KERNEL_SVN_REV = "769" +IXP4XX_KERNEL_SVN_REV = "770" # # The directory containing the patches to be applied is # specified below |