diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-08-19 12:48:09 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-08-19 12:48:09 +0200 |
| commit | c8710ad38900153af7a3e6762e99c062cfa46443 (patch) | |
| tree | a0c0632274c4eb72f51e99a5861f71cffe65ea60 /drivers/staging/iio/Makefile | |
| parent | 6016ee13db518ab1cd0cbf43fc2ad5712021e338 (diff) | |
| parent | 86397dc3ccfc0e17b7550d05eaf15fe91f6498dd (diff) | |
Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
Diffstat (limited to 'drivers/staging/iio/Makefile')
| -rw-r--r-- | drivers/staging/iio/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/iio/Makefile b/drivers/staging/iio/Makefile index 3502b39f084..e909674920f 100644 --- a/drivers/staging/iio/Makefile +++ b/drivers/staging/iio/Makefile @@ -14,5 +14,5 @@ obj-y += adc/ obj-y += gyro/ obj-y += imu/ obj-y += light/ - -obj-y += trigger/
\ No newline at end of file +obj-y += trigger/ +obj-y += magnetometer/ |