diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-05 14:18:03 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-05 14:18:03 -0700 |
| commit | e9563355ac1175dd3440dc2ea5c28b27ed51a283 (patch) | |
| tree | 8546d55832714b5d19ba4c7799266918ca04882e /drivers/staging/solo6x10/Makefile | |
| parent | cdd854bc42b5e6c79bbbc40c6600d995ffe6e747 (diff) | |
| parent | b12d1995f650e92f26184afd28e6cf40bf64467a (diff) | |
Staging: Merge staging-next into Linus's tree
Conflicts:
drivers/staging/Kconfig
drivers/staging/batman-adv/bat_sysfs.c
drivers/staging/batman-adv/device.c
drivers/staging/batman-adv/hard-interface.c
drivers/staging/cx25821/cx25821-audups11.c
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/solo6x10/Makefile')
| -rw-r--r-- | drivers/staging/solo6x10/Makefile | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/staging/solo6x10/Makefile b/drivers/staging/solo6x10/Makefile new file mode 100644 index 000000000000..7e70044d8dad --- /dev/null +++ b/drivers/staging/solo6x10/Makefile @@ -0,0 +1,6 @@ +solo6x10-objs := 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 + +obj-$(CONFIG_SOLO6X10) := solo6x10.o |