diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:33 +0800 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:33 +0800 |
| commit | 6c6c532c86bc2f335eed1537e6144266a114a4e9 (patch) | |
| tree | 3ae08a960f8f443e1a3c90e0744b0b53be4f4de7 /drivers/staging/Makefile | |
| parent | 5a5c0904d7eab2f2ce51419fbcd4e63247413d16 (diff) | |
| parent | c6edd75a89500109ee7a6baf929ac8748b077124 (diff) | |
Merge topic branch 'cg2900' into integration-linux-ux500
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 ffe7d44374e..cf15b26c8a1 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/ |