diff options
Diffstat (limited to 'packages/linux')
-rw-r--r-- | packages/linux/ixp4xx-kernel/2.6.21/defconfig | 10 | ||||
-rw-r--r-- | packages/linux/ixp4xx-kernel_2.6.21.6.bb | 2 | ||||
-rw-r--r-- | packages/linux/linux-rp_2.6.21.bb | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/packages/linux/ixp4xx-kernel/2.6.21/defconfig b/packages/linux/ixp4xx-kernel/2.6.21/defconfig index 15b4ba5829..56474d512a 100644 --- a/packages/linux/ixp4xx-kernel/2.6.21/defconfig +++ b/packages/linux/ixp4xx-kernel/2.6.21/defconfig @@ -883,12 +883,12 @@ CONFIG_TUN=m # Ethernet (10 or 100Mbit) # CONFIG_NET_ETHERNET=y -CONFIG_MII=y -CONFIG_IXP4XX_QMGR=y -CONFIG_IXP4XX_NPE=y +CONFIG_MII=m +CONFIG_IXP4XX_QMGR=m +CONFIG_IXP4XX_NPE=m CONFIG_IXP4XX_NPE_FW_LOAD=y CONFIG_IXP4XX_NPE_FW_MTD=y -CONFIG_IXP4XX_MAC=y +CONFIG_IXP4XX_MAC=m CONFIG_IXP4XX_CRYPTO=m # CONFIG_HAPPYMEAL is not set # CONFIG_SUNGEM is not set @@ -1537,7 +1537,7 @@ CONFIG_USB_DEVICEFS=y # # USB Host Controller Drivers # -CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_HCD=m CONFIG_USB_EHCI_SPLIT_ISO=y CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_TT_NEWSCHED=y diff --git a/packages/linux/ixp4xx-kernel_2.6.21.6.bb b/packages/linux/ixp4xx-kernel_2.6.21.6.bb index ae029136a9..ff90bcb3b3 100644 --- a/packages/linux/ixp4xx-kernel_2.6.21.6.bb +++ b/packages/linux/ixp4xx-kernel_2.6.21.6.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 = "911" +IXP4XX_KERNEL_SVN_REV = "914" # # The directory containing the patches to be applied is # specified below diff --git a/packages/linux/linux-rp_2.6.21.bb b/packages/linux/linux-rp_2.6.21.bb index 980732d409..3f155942e9 100644 --- a/packages/linux/linux-rp_2.6.21.bb +++ b/packages/linux/linux-rp_2.6.21.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r9" +PR = "r10" # Handy URLs # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046 @@ -33,7 +33,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.21.tar.bz2 \ ${RPSRC}/usb_add_epalloc-r3.patch;patch=1 \ ${RPSRC}/usb_pxa27x_udc-r4.patch;patch=1 \ ${RPSRC}/locomo_kbd_tweak-r1.patch;patch=1 \ - ${RPSRC}/poodle_pm-r3.patch;patch=1 \ + ${RPSRC}/poodle_pm-r4.patch;patch=1 \ ${RPSRC}/pxa27x_overlay-r5.patch;patch=1 \ ${RPSRC}/w100_extaccel-r0.patch;patch=1 \ ${RPSRC}/asoc_fix_typo-r0.patch;patch=1 \ |