diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/linux/linux-neuros/neuros-osd2/defconfig | 20 | ||||
| -rw-r--r-- | packages/linux/linux-neuros_git.bb | 4 |
2 files changed, 14 insertions, 10 deletions
diff --git a/packages/linux/linux-neuros/neuros-osd2/defconfig b/packages/linux/linux-neuros/neuros-osd2/defconfig index 5b7ac99929..b729767e3e 100644 --- a/packages/linux/linux-neuros/neuros-osd2/defconfig +++ b/packages/linux/linux-neuros/neuros-osd2/defconfig @@ -379,9 +379,10 @@ CONFIG_NETFILTER=y # CONFIG_CFG80211 is not set # CONFIG_WIRELESS_EXT is not set # CONFIG_MAC80211 is not set -# CONFIG_IEEE80211 is not set +CONFIG_IEEE80211=y # CONFIG_RFKILL is not set # CONFIG_NET_9P is not set +CONFIG_IEEE80211_SOFTMAC=y # # Device Drivers @@ -392,7 +393,7 @@ CONFIG_NETFILTER=y # CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y -# CONFIG_FW_LOADER is not set +CONFIG_FW_LOADER=y # CONFIG_SYS_HYPERVISOR is not set # CONFIG_CONNECTOR is not set CONFIG_MTD=y @@ -554,7 +555,7 @@ CONFIG_BLK_DEV_IDEDMA=y # SCSI device support # # CONFIG_RAID_ATTRS is not set -CONFIG_SCSI=m +CONFIG_SCSI=y CONFIG_SCSI_DMA=y # CONFIG_SCSI_TGT is not set # CONFIG_SCSI_NETLINK is not set @@ -563,7 +564,7 @@ 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 is not set # CONFIG_CHR_DEV_OSST is not set # CONFIG_BLK_DEV_SR is not set @@ -612,7 +613,8 @@ CONFIG_TI_DAVINCI_EMAC=y # Wireless LAN # # CONFIG_WLAN_PRE80211 is not set -# CONFIG_WLAN_80211 is not set +CONFIG_WLAN_80211=y +CONFIG_ZD1211RW=y # # USB Network Adapters @@ -769,6 +771,7 @@ CONFIG_SENSORS_TLV320AIC33=y # CONFIG_I2C_DEBUG_BUS is not set # CONFIG_I2C_DEBUG_CHIP is not set CONFIG_I2C_NEUROS_MSP430=m +CONFIG_I2C_NEUROS_SIL9034HDMI=m # # SPI support @@ -827,6 +830,7 @@ CONFIG_HWMON=y # CONFIG_HWMON_DEBUG_CHIP is not set CONFIG_MISC_DEVICES=y # CONFIG_EEPROM_93CX6 is not set +CONFIG_NEUROS_IR_BLASTER=m # # Multifunction device drivers @@ -972,7 +976,7 @@ CONFIG_USB_SUPPORT=y CONFIG_USB_ARCH_HAS_HCD=y # CONFIG_USB_ARCH_HAS_OHCI is not set # CONFIG_USB_ARCH_HAS_EHCI is not set -CONFIG_USB=m +CONFIG_USB=y # CONFIG_USB_DEBUG is not set # @@ -989,7 +993,7 @@ CONFIG_USB_DEVICE_CLASS=y # CONFIG_USB_ISP116X_HCD is not set # CONFIG_USB_SL811_HCD is not set # CONFIG_USB_R8A66597_HCD is not set -CONFIG_USB_MUSB_HDRC=m +CONFIG_USB_MUSB_HDRC=y CONFIG_USB_MUSB_SOC=y # @@ -1017,7 +1021,7 @@ CONFIG_USB_MUSB_LOGLEVEL=0 # # 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 diff --git a/packages/linux/linux-neuros_git.bb b/packages/linux/linux-neuros_git.bb index 069a8e1d2b..1869a1bd8d 100644 --- a/packages/linux/linux-neuros_git.bb +++ b/packages/linux/linux-neuros_git.bb @@ -2,10 +2,10 @@ require linux.inc DESCRIPTION = "Linux kernel for Neuros OSD devices" -SRCREV = "e471e0899c93ad2fbfcee967178a8fbb1f33983c" +SRCREV = "11c1e25ec8b9c6e1bef53d776ef3462aaacbd0a0" PV = "2.6.23-${PR}+git${SRCREV}" -PR = "r0" +PR = "r1" COMPATIBLE_MACHINE = "(neuros-osd|neuros-osd2)" |