summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@linaro.org>2011-11-17 15:53:19 +0100
committerPhilippe Langlais <philippe.langlais@stericsson.com>2011-12-06 10:59:57 +0100
commit9f66af2452e6f7a6219ee2c8322a2ed4886b8443 (patch)
tree36c0efc91bfc6fc378bd2ec8be8ef65eedf656a6
parent9fb528df2c22179f753c0fe5336e33f6a05fe4c7 (diff)
staging: Add ST-Ericsson CG2900 driver compilation
Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
-rw-r--r--drivers/staging/Kconfig2
-rw-r--r--drivers/staging/Makefile1
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 06c9081d596..9569b2366d8 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -46,6 +46,8 @@ source "drivers/staging/echo/Kconfig"
source "drivers/staging/brcm80211/Kconfig"
+source "drivers/staging/cg2900/Kconfig"
+
source "drivers/staging/comedi/Kconfig"
source "drivers/staging/olpc_dcon/Kconfig"
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index f3c5e33bb26..adac8a21754 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -16,6 +16,7 @@ obj-$(CONFIG_PRISM2_USB) += wlan-ng/
obj-$(CONFIG_ECHO) += echo/
obj-$(CONFIG_BRCMSMAC) += brcm80211/
obj-$(CONFIG_BRCMFMAC) += brcm80211/
+obj-$(CONFIG_CG2900) += cg2900/
obj-$(CONFIG_COMEDI) += comedi/
obj-$(CONFIG_FB_OLPC_DCON) += olpc_dcon/
obj-$(CONFIG_ASUS_OLED) += asus_oled/