diff options
| author | Rod Whitby <rod@whitby.id.au> | 2009-02-08 17:06:39 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2009-02-08 17:06:39 +0000 |
| commit | 66192bbdaab409dff4b6f812dbd5c07cd943cdac (patch) | |
| tree | e58178ba09343fddc5975aa2825a1887f57ea0f0 /packages/linux | |
| parent | 0441c262c64cc796f01921663d7ff9af7871e699 (diff) | |
| parent | bd64c83575be0d2d32702bfc361ea2897d18e1e4 (diff) | |
Merge branch 'org.openembedded.dev' of git://git.openembedded.net/openembedded into org.openembedded.dev
Diffstat (limited to 'packages/linux')
| -rw-r--r-- | packages/linux/linux-rp-2.6.24/defconfig-tosa | 22 | ||||
| -rw-r--r-- | packages/linux/linux-rp_2.6.24.bb | 2 |
2 files changed, 16 insertions, 8 deletions
diff --git a/packages/linux/linux-rp-2.6.24/defconfig-tosa b/packages/linux/linux-rp-2.6.24/defconfig-tosa index a7b8a8229e..b39c9f0914 100644 --- a/packages/linux/linux-rp-2.6.24/defconfig-tosa +++ b/packages/linux/linux-rp-2.6.24/defconfig-tosa @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.24 -# Wed Feb 4 10:30:32 2009 +# Sun Feb 8 12:31:04 2009 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -760,14 +760,22 @@ CONFIG_NETDEV_10000=y # CONFIG_WLAN_PRE80211 is not set CONFIG_WLAN_80211=y # CONFIG_PCMCIA_RAYCS is not set -# CONFIG_LIBERTAS is not set -# CONFIG_HERMES is not set -# CONFIG_ATMEL is not set -# CONFIG_AIRO_CS is not set -# CONFIG_PCMCIA_WL3501 is not set -# CONFIG_USB_ZD1201 is not set +CONFIG_LIBERTAS=m +CONFIG_LIBERTAS_USB=m +CONFIG_LIBERTAS_CS=m +CONFIG_LIBERTAS_SDIO=m +# CONFIG_LIBERTAS_DEBUG is not set +CONFIG_HERMES=m +CONFIG_PCMCIA_HERMES=m +CONFIG_PCMCIA_SPECTRUM=m +CONFIG_ATMEL=m +CONFIG_PCMCIA_ATMEL=m +CONFIG_AIRO_CS=m +CONFIG_PCMCIA_WL3501=m +CONFIG_USB_ZD1201=m CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y +# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set CONFIG_HOSTAP_CS=m # diff --git a/packages/linux/linux-rp_2.6.24.bb b/packages/linux/linux-rp_2.6.24.bb index 8c7a22d00f..7b06916e1c 100644 --- a/packages/linux/linux-rp_2.6.24.bb +++ b/packages/linux/linux-rp_2.6.24.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r21" +PR = "r22" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_collie = "1" |