diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-10-17 15:05:26 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-10-17 15:05:26 -0400 |
| commit | 41ebe9cde738a972d05c7282e09f5ed54cff0e8d (patch) | |
| tree | 223bf0feb7305e46989b60c3f070bef87d5fcab4 /drivers/staging | |
| parent | fd38f734cb8200529e281338514945fcbff2364b (diff) | |
| parent | 5c1381ac3f3f49ab1e0886ea8f1432c9a5def519 (diff) | |
| download | op-kernel-dev-41ebe9cde738a972d05c7282e09f5ed54cff0e8d.zip op-kernel-dev-41ebe9cde738a972d05c7282e09f5ed54cff0e8d.tar.gz | |
Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/staging/Makefile | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index d497a93..2582e18 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -44,7 +44,7 @@ source "drivers/staging/wlan-ng/Kconfig" source "drivers/staging/echo/Kconfig" -source "drivers/staging/brcm80211/Kconfig" + source "drivers/staging/comedi/Kconfig" diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index fe6c611..50d112f 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -14,8 +14,8 @@ obj-$(CONFIG_USBIP_CORE) += usbip/ obj-$(CONFIG_W35UND) += winbond/ obj-$(CONFIG_PRISM2_USB) += wlan-ng/ obj-$(CONFIG_ECHO) += echo/ -obj-$(CONFIG_BRCMSMAC) += brcm80211/ -obj-$(CONFIG_BRCMFMAC) += brcm80211/ + + obj-$(CONFIG_COMEDI) += comedi/ obj-$(CONFIG_FB_OLPC_DCON) += olpc_dcon/ obj-$(CONFIG_ASUS_OLED) += asus_oled/ |
