diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:28 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:28 +0200 |
| commit | a14bad32f8e7be121db40d883b9cdedfdf99a62d (patch) | |
| tree | 8d110be667a8e8062ec80ee290479021c219ee5f /drivers/staging/Makefile | |
| parent | fef3d2453378a4bbd73c72d4764ea1334c24cb18 (diff) | |
| parent | 10b980fd6c94e761ce5e00b0c4fceacc03c7f629 (diff) | |
Merge topic branch 'cg2900' into integration-linux-ux500-3.3
Diffstat (limited to 'drivers/staging/Makefile')
| -rw-r--r-- | drivers/staging/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index 943e1483075..5b245202524 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -11,6 +11,7 @@ obj-$(CONFIG_USBIP_CORE) += usbip/ obj-$(CONFIG_W35UND) += winbond/ obj-$(CONFIG_PRISM2_USB) += wlan-ng/ obj-$(CONFIG_ECHO) += echo/ +obj-$(CONFIG_CG2900) += cg2900/ obj-$(CONFIG_COMEDI) += comedi/ obj-$(CONFIG_FB_OLPC_DCON) += olpc_dcon/ obj-$(CONFIG_ASUS_OLED) += asus_oled/ |