diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-10 19:04:53 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-10 19:04:53 -0500 |
commit | 949f6711b83d2809d1ccb9d830155a65fdacdff9 (patch) | |
tree | 4b8bdb0e98489bc8ad77fa144926931c37e2e4f2 /drivers/staging/iio/accel/Makefile | |
parent | 443e6221e465efa8efb752a8405a759ef1161af9 (diff) | |
parent | 7959d55679e4360205c9ebc89d40a5503c53bae2 (diff) |
Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (510 commits)
staging: speakup: fix failure handling
staging: usbip: remove double giveback of URB
Staging: batman-adv: Remove batman-adv from staging
Staging: hv: Use only one txf buffer per channel and kmalloc/GFP_KERNEL on initialize
staging: hv: remove unneeded osd_schedule_callback
staging: hv: convert channel_mgmt.c to not call osd_schedule_callback
staging: hv: convert vmbus_on_msg_dpc to not call osd_schedule_callback
staging: brcm80211: Fix WL_<type> logging macros
Staging: IIO: DDS: AD9833 / AD9834 driver
Staging: IIO: dds.h convenience macros
Staging: IIO: Direct digital synthesis abi documentation
staging: brcm80211: Convert ETHER_TYPE_802_1X to ETH_P_PAE
staging: brcm80211: Remove unused ETHER_TYPE_<foo> #defines
staging: brcm80211: Remove ETHER_HDR_LEN, use ETH_HLEN
staging: brcm80211: Convert ETHER_ADDR_LEN to ETH_ALEN
staging: brcm80211: Convert ETHER_IS<FOO> to is_<foo>_ether_addr
staging: brcm80211: Remove unused ether_<foo> #defines and struct
staging: brcm80211: Convert ETHER_IS_MULTI to is_multicast_ether_addr
staging: brcm80211: Remove unused #defines ETHER_<foo>_LOCALADDR
Staging: comedi: Fix checkpatch.pl issues in file s526.c
...
Fix up trivial conflict in drivers/video/udlfb.c
Diffstat (limited to 'drivers/staging/iio/accel/Makefile')
-rw-r--r-- | drivers/staging/iio/accel/Makefile | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/staging/iio/accel/Makefile b/drivers/staging/iio/accel/Makefile index ff84703a16f..1b2a6d3ddaf 100644 --- a/drivers/staging/iio/accel/Makefile +++ b/drivers/staging/iio/accel/Makefile | |||
@@ -2,6 +2,18 @@ | |||
2 | # Makefile for industrial I/O accelerometer drivers | 2 | # Makefile for industrial I/O accelerometer drivers |
3 | # | 3 | # |
4 | 4 | ||
5 | adis16201-y := adis16201_core.o | ||
6 | adis16201-$(CONFIG_IIO_RING_BUFFER) += adis16201_ring.o adis16201_trigger.o | ||
7 | obj-$(CONFIG_ADIS16201) += adis16201.o | ||
8 | |||
9 | adis16203-y := adis16203_core.o | ||
10 | adis16203-$(CONFIG_IIO_RING_BUFFER) += adis16203_ring.o adis16203_trigger.o | ||
11 | obj-$(CONFIG_ADIS16203) += adis16203.o | ||
12 | |||
13 | adis16204-y := adis16204_core.o | ||
14 | adis16204-$(CONFIG_IIO_RING_BUFFER) += adis16204_ring.o adis16204_trigger.o | ||
15 | obj-$(CONFIG_ADIS16204) += adis16204.o | ||
16 | |||
5 | adis16209-y := adis16209_core.o | 17 | adis16209-y := adis16209_core.o |
6 | adis16209-$(CONFIG_IIO_RING_BUFFER) += adis16209_ring.o adis16209_trigger.o | 18 | adis16209-$(CONFIG_IIO_RING_BUFFER) += adis16209_ring.o adis16209_trigger.o |
7 | obj-$(CONFIG_ADIS16209) += adis16209.o | 19 | obj-$(CONFIG_ADIS16209) += adis16209.o |