diff options
| author |   Jiri Kosina <jkosina@suse.cz> | 2010-10-30 22:16:56 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-10-30 22:16:56 +0200 |
| commit | f1e095f1d206b81b44160f41278ce5c78641e9b7 (patch) | |
| tree | bd293d46d2d3e4cdf435a22ddb2877c6ba1b8acc /drivers/staging/line6/Makefile | |
| parent | telephony: fix return value (diff) | |
| parent | Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify (diff) | |
| download | linux-dev-f1e095f1d206b81b44160f41278ce5c78641e9b7.tar.xz linux-dev-f1e095f1d206b81b44160f41278ce5c78641e9b7.zip | |
Merge branch 'master' into for-next
Diffstat (limited to 'drivers/staging/line6/Makefile')
| -rw-r--r-- | drivers/staging/line6/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/line6/Makefile b/drivers/staging/line6/Makefile index a1c93edc6b1d..de6bd12e9736 100644 --- a/drivers/staging/line6/Makefile +++ b/drivers/staging/line6/Makefile @@ -1,6 +1,6 @@ obj-$(CONFIG_LINE6_USB) += line6usb.o -line6usb-objs := \ +line6usb-y := \ audio.o \ capture.o \ control.o \ |