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/solo6x10/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/solo6x10/Makefile')
| -rw-r--r-- | drivers/staging/solo6x10/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/solo6x10/Makefile b/drivers/staging/solo6x10/Makefile index 7e70044d8dad..1616b5535474 100644 --- a/drivers/staging/solo6x10/Makefile +++ b/drivers/staging/solo6x10/Makefile @@ -1,4 +1,4 @@ -solo6x10-objs := solo6010-core.o solo6010-i2c.o solo6010-p2m.o \ +solo6x10-y := solo6010-core.o solo6010-i2c.o solo6010-p2m.o \ solo6010-v4l2.o solo6010-tw28.o solo6010-gpio.o \ solo6010-disp.o solo6010-enc.o solo6010-v4l2-enc.o \ solo6010-g723.o |