diff options
| author | Tejun Heo <tj@kernel.org> | 2012-11-06 21:26:23 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2012-11-06 21:26:23 +0100 |
| commit | 5b805f2a7675634fbdf9ac1c9b2256905ab2ea68 (patch) | |
| tree | ee00d1e3d757458d66209b926d274491c6c3f61c /drivers/iio/Makefile | |
| parent | Merge branch 'cgroup-rmdir-updates' into cgroup/for-3.8 (diff) | |
| parent | device_cgroup: fix RCU usage (diff) | |
| download | linux-5b805f2a7675634fbdf9ac1c9b2256905ab2ea68.tar.xz linux-5b805f2a7675634fbdf9ac1c9b2256905ab2ea68.zip | |
Merge branch 'cgroup/for-3.7-fixes' into cgroup/for-3.8
This is to receive device_cgroup fixes so that further device_cgroup
changes can be made in cgroup/for-3.8.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/iio/Makefile')
| -rw-r--r-- | drivers/iio/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/iio/Makefile b/drivers/iio/Makefile index f7fa3c0867b4..761f2b65ac52 100644 --- a/drivers/iio/Makefile +++ b/drivers/iio/Makefile @@ -18,5 +18,4 @@ obj-y += frequency/ obj-y += dac/ obj-y += common/ obj-y += gyro/ -obj-y += light/ obj-y += magnetometer/ |