Merge branch 'master' of git://nbd.name/openwrt

package/kernel/modules/other.mk

@@ -431,6 +431,7 @@ define KernelPackage/bcma
 	CONFIG_BCMA_HOST_PCI=y \
 	CONFIG_BCMA_DRIVER_MIPS=n \
 	CONFIG_BCMA_DRIVER_PCI_HOSTMODE=n \
+	CONFIG_BCMA_DRIVER_GMAC_CMN=n \
 	CONFIG_BCMA_DEBUG=n
   FILES:=$(LINUX_DIR)/drivers/bcma/bcma.ko
   AUTOLOAD:=$(call AutoLoad,29,bcma)

package/mac80211/Makefile

@@ -1083,6 +1083,7 @@ define KernelPackage/brcmutil
   $(call KernelPackage/mac80211/Default)
   TITLE:=Broadcom IEEE802.11n common driver parts
   URL:=http://linuxwireless.org/en/users/Drivers/brcm80211
+  DEPENDS+=@PCI_SUPPORT||USB_SUPPORT
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/brcm80211/brcmutil/brcmutil.ko
   AUTOLOAD:=$(call AutoLoad,30,brcmutil)
   MENU:=1

target/linux/atheros/base-files/etc/uci-defaults/leds

@@ -0,0 +1,11 @@
+#!/bin/sh
+# Copyright 2012 OpenWrt.org
+#
+
+. /lib/functions/uci-defaults.sh
+
+ucidef_set_led_netdev "wlan" "wlan" "wlan" "wlan0"
+
+ucidef_commit_leds
+
+exit 0

target/linux/atheros/config-3.3

@@ -70,6 +70,7 @@ CONFIG_INITRAMFS_SOURCE=""
 CONFIG_IP17XX_PHY=y
 CONFIG_IRQ_CPU=y
 CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_LEDS_GPIO=y
 CONFIG_MDIO_BOARDINFO=y
 CONFIG_MIPS=y
 CONFIG_MIPS_L1_CACHE_SHIFT=5

target/linux/brcm2708/config-3.3

@@ -22,6 +22,10 @@ CONFIG_ARM_NR_BANKS=8
 CONFIG_ARM_THUMB=y
 CONFIG_ARM_UNWIND=y
 CONFIG_AVERAGE=y
+# CONFIG_BACKLIGHT_ADP8860 is not set
+# CONFIG_BACKLIGHT_ADP8870 is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=m
+CONFIG_BACKLIGHT_GENERIC=m
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_BCM2708_GPIO=y
 # CONFIG_BCM2708_NOL2CACHE is not set
@@ -36,8 +40,6 @@ CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BLK_DEV_SD=y
 # CONFIG_CACHE_L2X0 is not set
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_CMDLINE="dwc_otg.lpm_enable=0 console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext3 rootwait"
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
@@ -64,7 +66,6 @@ CONFIG_CPU_TLB_V6=y
 CONFIG_CPU_USE_DOMAINS=y
 CONFIG_CPU_V6=y
 CONFIG_CRC16=y
-# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_USER is not set
@@ -80,13 +81,11 @@ CONFIG_EXT4_FS=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_FB=y
-# CONFIG_FB_ARMCLCD is not set
 CONFIG_FB_BCM2708=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_WMT_GE_ROPS is not set
-# CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIRMWARE_IN_KERNEL=y
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x16=y
@@ -148,13 +147,20 @@ CONFIG_INPUT_MOUSEDEV=y
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_IOSCHED_CFQ=y
-# CONFIG_IWMC3200TOP_DEBUG is not set
-# CONFIG_IWMC3200TOP_DEBUGFS is not set
 CONFIG_JBD2=y
 CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_XZ is not set
 CONFIG_KTIME_SCALAR=y
+CONFIG_LCD_CLASS_DEVICE=m
+# CONFIG_LCD_AMS369FG06 is not set
+# CONFIG_LCD_L4F00242T03 is not set
+# CONFIG_LCD_LD9040 is not set
+# CONFIG_LCD_LMS283GF05 is not set
+# CONFIG_LCD_LTV350QV is not set
 # CONFIG_LCD_PLATFORM is not set
+# CONFIG_LCD_S6E63M0 is not set
+# CONFIG_LCD_TDO24M is not set
+# CONFIG_LCD_VGG2432A4 is not set
 CONFIG_LEDS_GPIO=y
 # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
 # CONFIG_LEDS_TRIGGER_TIMER is not set
@@ -207,8 +213,6 @@ CONFIG_SCSI=y
 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 # CONFIG_SQUASHFS is not set
-CONFIG_SSB_BLOCKIO=y
-CONFIG_SSB_SDIOHOST_POSSIBLE=y
 # CONFIG_STAGING is not set
 # CONFIG_STRIP_ASM_SYMS is not set
 CONFIG_SUSPEND=y
@@ -231,7 +235,6 @@ CONFIG_USB_LIBUSUAL=y
 CONFIG_USB_NET_SMSC95XX=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_SUPPORT=y
-# CONFIG_USB_U132_HCD is not set
 CONFIG_USB_UAS=y
 CONFIG_USB_USBNET=y
 CONFIG_VECTORS_BASE=0xffff0000

target/linux/brcm47xx/config-3.3

@@ -14,6 +14,7 @@ CONFIG_BCM47XX_WDT=y
 CONFIG_BCMA=y
 CONFIG_BCMA_BLOCKIO=y
 CONFIG_BCMA_DEBUG=y
+CONFIG_BCMA_DRIVER_GMAC_CMN=y
 CONFIG_BCMA_DRIVER_MIPS=y
 CONFIG_BCMA_DRIVER_PCI_HOSTMODE=y
 CONFIG_BCMA_HOST_PCI=y

target/linux/ep93xx/modules.mk

@@ -60,7 +60,7 @@ $(eval $(call KernelPackage,sound-soc-ep93xx))
 define KernelPackage/sound-soc-ep93xx-ac97
   SUBMENU:=$(SOUND_MENU)
   TITLE:=EP93xx SoC AC97 support
-  DEPENDS:=+kmod-sound-soc-ep93xx
+  DEPENDS:=@TARGET_ep93xx +kmod-sound-soc-ep93xx
   KCONFIG:=CONFIG_SND_EP93XX_SOC_AC97
   FILES:=$(LINUX_DIR)/sound/soc/ep93xx/snd-soc-ep93xx-ac97.ko
   AUTOLOAD:=$(call AutoLoad,56,snd-soc-ep93xx-ac97)
@@ -75,7 +75,7 @@ $(eval $(call KernelPackage,sound-soc-ep93xx-ac97))
 define KernelPackage/sound-soc-ep93xx-simone
   SUBMENU:=$(SOUND_MENU)
   TITLE:=Sim.One EP93xx Soc sound support
-  DEPENDS:=+kmod-sound-soc-ep93xx +kmod-sound-soc-ep93xx-ac97
+  DEPENDS:=@TARGET_ep93xx +kmod-sound-soc-ep93xx +kmod-sound-soc-ep93xx-ac97
   KCONFIG:=CONFIG_SND_EP93XX_SOC_SIMONE
   FILES:=$(LINUX_DIR)/sound/soc/ep93xx/snd-soc-simone.ko
   AUTOLOAD:=$(call AutoLoad,59,snd-soc-ep93xx)
@@ -90,6 +90,7 @@ $(eval $(call KernelPackage,sound-soc-ep93xx-simone))
 define KernelPackage/touchscreen-ep93xx
   SUBMENU:=$(OTHER_MENU)
   TITLE:=EP93xx input touchscreen support
+  DEPENDS:=@TARGET_ep93xx
   KCONFIG:=CONFIG_TOUCHSCREEN_EP93XX
   FILES:=$(LINUX_DIR)/drivers/input/touchscreen/ep93xx_ts.ko
   AUTOLOAD:=$(call AutoLoad,51,ep93xx_ts)

target/linux/generic/config-3.3

@@ -2994,6 +2994,7 @@ CONFIG_USB_ARMLINUX=y
 CONFIG_USB_BELKIN=y
 # CONFIG_USB_C67X00_HCD is not set
 # CONFIG_USB_CATC is not set
+# CONFIG_USB_CDC_COMPOSITE is not set
 # CONFIG_USB_CXACRU is not set
 # CONFIG_USB_CYPRESS_CY7C63 is not set
 # CONFIG_USB_CYTHERM is not set
@@ -3003,6 +3004,8 @@ CONFIG_USB_DEVICEFS=y
 # CONFIG_USB_DSBR is not set
 # CONFIG_USB_DWC3 is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_DUMMY_HCD is not set
+# CONFIG_USB_DWC_OTG_LPM is not set
 # CONFIG_USB_EHCI_MV is not set
 # CONFIG_USB_EHCI_HCD_PPC_OF is not set
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
@@ -3013,9 +3016,17 @@ CONFIG_USB_EHCI_ROOT_HUB_TT=y
 # CONFIG_USB_EPSON2888 is not set
 # CONFIG_USB_ET61X251 is not set
 CONFIG_USB_EZUSB=y
+# CONFIG_USB_FILE_STORAGE is not set
 # CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_FUNCTIONFS is not set
+# CONFIG_USB_FUSB300 is not set
+# CONFIG_USB_R8A66597 is not set
 # CONFIG_USB_GADGET is not set
+# CONFIG_USB_GADGETFS is not set
 # CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_VBUS_DRAW=2
 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 # CONFIG_USB_GL860 is not set
 # CONFIG_USB_GPIO_VBUS is not set
@@ -3064,8 +3075,13 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 # CONFIG_USB_GSPCA_XIRLINK_CIT is not set
 # CONFIG_USB_GSPCA_ZC3XX is not set
 # CONFIG_USB_G_ACM_MS is not set
+# CONFIG_USB_G_DBGP is not set
+# CONFIG_USB_G_HID is not set
 # CONFIG_USB_G_MULTI is not set
+# CONFIG_USB_G_NCM is not set
 # CONFIG_USB_G_NOKIA is not set
+# CONFIG_USB_G_PRINTER is not set
+# CONFIG_USB_G_SERIAL is not set
 # CONFIG_USB_G_WEBCAM is not set
 # CONFIG_USB_HID is not set
 # CONFIG_USB_HIDDEV is not set
@@ -3090,13 +3106,16 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 # CONFIG_USB_LEGOTOWER is not set
 # CONFIG_USB_LIBUSUAL is not set
 # CONFIG_USB_M5602 is not set
+# CONFIG_USB_M66592 is not set
 # CONFIG_USB_MASS_STORAGE is not set
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_MICROTEK is not set
 # CONFIG_USB_MIDI_GADGET is not set
 # CONFIG_USB_MON is not set
 # CONFIG_USB_MOUSE is not set
 # CONFIG_USB_MUSB_HDRC is not set
+# CONFIG_USB_MV_UDC is not set
+# CONFIG_USB_NET2272 is not set
 # CONFIG_USB_NET_AX8817X is not set
 # CONFIG_USB_NET_CDCETHER is not set
 # CONFIG_USB_NET_CDC_EEM is not set
@@ -3247,6 +3266,7 @@ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
 # CONFIG_USB_XUSBATM is not set
 # CONFIG_USB_YUREX is not set
 # CONFIG_USB_ZD1201 is not set
+# CONFIG_USB_ZERO is not set
 # CONFIG_USB_ZR364XX is not set
 # CONFIG_USE_GENERIC_SMP_HELPERS is not set
 # CONFIG_USE_OF is not set