git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
[sfrench/cifs-2.6.git]
/
drivers
/
staging
/
iio
/
light
/
Makefile
diff --git
a/drivers/staging/iio/light/Makefile
b/drivers/staging/iio/light/Makefile
index 30f3300e2a68de45faa4954e5ab41a581c4fcc88..9142c0e5a1b61db876a7a196b6db0609c712a2f1 100644
(file)
--- a/
drivers/staging/iio/light/Makefile
+++ b/
drivers/staging/iio/light/Makefile
@@
-3,3
+3,4
@@
#
obj-$(CONFIG_SENSORS_TSL2563) += tsl2563.o
+obj-$(CONFIG_SENSORS_ISL29018) += isl29018.o