diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-03-25 08:35:17 (GMT) |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-03-25 11:25:07 (GMT) |
| commit | dcae5dacbce518513abf7776cb450b7bd95d722b (patch) | |
| tree | 2e0d8d5376ca5655b38eae279b6112efdca7cc1d /drivers/staging/media/solo6x10/Makefile | |
| parent | c535cc6c714bd21b3afad35baa926b3b9eb51361 (diff) | |
| download | linux-fsl-qoriq-dcae5dacbce518513abf7776cb450b7bd95d722b.tar.xz | |
[media] solo6x10: sync to latest code from Bluecherry's git repo
Synced to commit e9815ac5503ae60cfbf6ff8037035de8f62e2846 from
branch next in git repository https://github.com/bluecherrydvr/solo6x10.git
Only removed some code under #if LINUX_VERSION_CODE < some-kernel-version,
renamed the driver back to solo6x10 from solo6x10-edge, removed the
unnecessary compat.h header and kept the slab.h includes.
Otherwise the code is identical.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Ismael Luceno <ismael.luceno@corp.bluecherry.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/staging/media/solo6x10/Makefile')
| -rw-r--r-- | drivers/staging/media/solo6x10/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/media/solo6x10/Makefile b/drivers/staging/media/solo6x10/Makefile index 337e38c..9bbde29 100644 --- a/drivers/staging/media/solo6x10/Makefile +++ b/drivers/staging/media/solo6x10/Makefile @@ -1,3 +1,3 @@ -solo6x10-y := core.o i2c.o p2m.o v4l2.o tw28.o gpio.o disp.o enc.o v4l2-enc.o g723.o +solo6x10-y := core.o i2c.o p2m.o v4l2.o tw28.o gpio.o disp.o enc.o v4l2-enc.o g723.o eeprom.o obj-$(CONFIG_SOLO6X10) += solo6x10.o |