diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-09-20 14:48:57 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-09-20 14:48:57 +0000 |
| commit | 841bb4846f4822238f10b5ae14d7545f7e4a288f (patch) | |
| tree | b72284918a35a6263d4ae0d7ae1dfe167e657680 /packages | |
| parent | 3f24acef873cb1ab43b40fe7b2c5d6e065dd6dc5 (diff) | |
| parent | 817f413d3dae1c73f9ae31e532ef08687df1a63e (diff) | |
merge of '5d7ba35bbc10b4418bedaa07910b69c32a41cb3c'
and '716a5d6fd8174fcd76d0f8767c7ee982f27832fa'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/linux/linux-omap2-git/beagleboard/defconfig | 40 | ||||
| -rw-r--r-- | packages/linux/linux-omap2_git.bb | 2 |
2 files changed, 30 insertions, 12 deletions
diff --git a/packages/linux/linux-omap2-git/beagleboard/defconfig b/packages/linux/linux-omap2-git/beagleboard/defconfig index 867b5b885c..47c41f1425 100644 --- a/packages/linux/linux-omap2-git/beagleboard/defconfig +++ b/packages/linux/linux-omap2-git/beagleboard/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.26-omap1 -# Wed Sep 3 15:38:48 2008 +# Sat Sep 20 15:44:20 2008 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -615,7 +615,7 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8 # CONFIG_CDROM_PKTCDVD_WCACHE is not set # CONFIG_ATA_OVER_ETH is not set CONFIG_MISC_DEVICES=y -# CONFIG_EEPROM_93CX6 is not set +CONFIG_EEPROM_93CX6=m # CONFIG_OMAP_STI is not set # CONFIG_ENCLOSURE_SERVICES is not set CONFIG_HAVE_IDE=y @@ -704,20 +704,36 @@ CONFIG_MII=y CONFIG_WLAN_80211=y CONFIG_LIBERTAS=m CONFIG_LIBERTAS_USB=m -# CONFIG_LIBERTAS_SDIO is not set +CONFIG_LIBERTAS_SDIO=m # CONFIG_LIBERTAS_DEBUG is not set CONFIG_USB_ZD1201=m -# CONFIG_USB_NET_RNDIS_WLAN is not set -# CONFIG_RTL8187 is not set -# CONFIG_P54_COMMON is not set +CONFIG_USB_NET_RNDIS_WLAN=m +CONFIG_RTL8187=m +CONFIG_P54_COMMON=m +CONFIG_P54_USB=m # CONFIG_IWLWIFI_LEDS is not set CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_FIRMWARE_NVRAM=y -# CONFIG_B43 is not set +CONFIG_B43=m +CONFIG_B43_LEDS=y +# CONFIG_B43_DEBUG is not set # CONFIG_B43LEGACY is not set -# CONFIG_ZD1211RW is not set -# CONFIG_RT2X00 is not set +# CONFIG_B43LEGACY_DMA_AND_PIO_MODE is not set +# CONFIG_B43LEGACY_DMA_MODE is not set +# CONFIG_B43LEGACY_PIO_MODE is not set +CONFIG_ZD1211RW=m +# CONFIG_ZD1211RW_DEBUG is not set +CONFIG_RT2X00=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_LEDS=y +CONFIG_RT2500USB=m +CONFIG_RT2500USB_LEDS=y +CONFIG_RT73USB=m +CONFIG_RT73USB_LEDS=y +# CONFIG_RT2X00_DEBUG is not set # # USB Network Adapters @@ -753,7 +769,7 @@ CONFIG_PPP_DEFLATE=m CONFIG_PPP_BSDCOMP=m CONFIG_PPP_MPPE=m CONFIG_PPPOE=m -# CONFIG_PPPOL2TP is not set +CONFIG_PPPOL2TP=m # CONFIG_SLIP is not set CONFIG_SLHC=m # CONFIG_NETCONSOLE is not set @@ -1011,7 +1027,9 @@ CONFIG_OMAP_WATCHDOG=y # Sonics Silicon Backplane # CONFIG_SSB_POSSIBLE=y -# CONFIG_SSB is not set +CONFIG_SSB=m +# CONFIG_SSB_SILENT is not set +# CONFIG_SSB_DEBUG is not set # # Multifunction device drivers diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb index 5a8aeb16a0..ded3a3bbe8 100644 --- a/packages/linux/linux-omap2_git.bb +++ b/packages/linux/linux-omap2_git.bb @@ -6,7 +6,7 @@ SRCREV = "d6daf8d8cc5ccf90247def5551ee9c3e8555e848" PV = "2.6.26" #PV = "2.6.26+2.6.27-rc1+${PR}+git${SRCREV}" -PR = "r62" +PR = "r63" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \ file://defconfig" |