linux-sg2042/drivers/staging/iio
Linus Torvalds 32aaeffbd4 Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
* 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)
  Revert "tracing: Include module.h in define_trace.h"
  irq: don't put module.h into irq.h for tracking irqgen modules.
  bluetooth: macroize two small inlines to avoid module.h
  ip_vs.h: fix implicit use of module_get/module_put from module.h
  nf_conntrack.h: fix up fallout from implicit moduleparam.h presence
  include: replace linux/module.h with "struct module" wherever possible
  include: convert various register fcns to macros to avoid include chaining
  crypto.h: remove unused crypto_tfm_alg_modname() inline
  uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
  pm_runtime.h: explicitly requires notifier.h
  linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h
  miscdevice.h: fix up implicit use of lists and types
  stop_machine.h: fix implicit use of smp.h for smp_processor_id
  of: fix implicit use of errno.h in include/linux/of.h
  of_platform.h: delete needless include <linux/module.h>
  acpi: remove module.h include from platform/aclinux.h
  miscdevice.h: delete unnecessary inclusion of module.h
  device_cgroup.h: delete needless include <linux/module.h>
  net: sch_generic remove redundant use of <linux/module.h>
  net: inet_timewait_sock doesnt need <linux/module.h>
  ...

Fix up trivial conflicts (other header files, and  removal of the ab3550 mfd driver) in
 - drivers/media/dvb/frontends/dibx000_common.c
 - drivers/media/video/{mt9m111.c,ov6650.c}
 - drivers/mfd/ab3550-core.c
 - include/linux/dmaengine.h
2011-11-06 19:44:47 -08:00
..
Documentation staging:iio:Documentation gyro -> anglvel updates in attribute names 2011-10-05 13:47:47 -07:00
accel staging: Add export.h for THIS_MODULE/EXPORT_SYMBOL to drivers/staging users. 2011-10-31 19:32:08 -04:00
adc staging: Add module.h to more drivers implicitly using it. 2011-10-31 19:32:10 -04:00
addac Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 2011-10-26 15:39:02 +02:00
cdc iio: cdc: Fix pushed event code - Typo, should be IIO_CAPACITANCE. 2011-10-19 13:55:44 -07:00
dac staging: Add module.h to more drivers implicitly using it. 2011-10-31 19:32:10 -04:00
dds Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 2011-10-26 15:39:02 +02:00
gyro staging: Add module.h to more drivers implicitly using it. 2011-10-31 19:32:10 -04:00
impedance-analyzer staging:iio: fix removal path to allow correct freeing. 2011-10-17 15:34:53 -07:00
imu staging: Add export.h for THIS_MODULE/EXPORT_SYMBOL to drivers/staging users. 2011-10-31 19:32:08 -04:00
light staging:iio: fix removal path to allow correct freeing. 2011-10-17 15:34:53 -07:00
magnetometer staging:iio: fix removal path to allow correct freeing. 2011-10-17 15:34:53 -07:00
meter staging: Add export.h for THIS_MODULE/EXPORT_SYMBOL to drivers/staging users. 2011-10-31 19:32:08 -04:00
resolver staging:iio: fix removal path to allow correct freeing. 2011-10-17 15:34:53 -07:00
trigger staging:iio:trigger:bfin-timer: Fix compile error 2011-10-23 10:15:02 +02:00
Kconfig iio: adc: Relocate Capacitance to Digital Converters (CDC) into own subdir 2011-10-19 13:55:43 -07:00
Makefile iio: adc: Relocate Capacitance to Digital Converters (CDC) into own subdir 2011-10-19 13:55:43 -07:00
TODO staging: iio: add ADI info to TODO 2010-11-09 15:46:32 -08:00
buffer_generic.h staging:iio:core:naming: dev_info to indio_dev for consistency 2011-10-11 09:58:58 -06:00
chrdev.h staging:iio:events - new 64 bit code structure and push out drivers. 2011-09-06 16:02:00 -07:00
iio.h staging:iio:core:naming: dev_info to indio_dev for consistency 2011-10-11 09:58:58 -06:00
iio_core.h staging:iio: Prevent reading from buffer chrdev when device has no buffer. 2011-09-26 17:31:56 -07:00
iio_core_trigger.h staging:iio:core:naming: dev_info to indio_dev for consistency 2011-10-11 09:58:58 -06:00
iio_dummy_evgen.c staging:iio:dummy Add event support + fake event generator 2011-10-17 15:36:30 -07:00
iio_dummy_evgen.h staging:iio:dummy Add event support + fake event generator 2011-10-17 15:36:30 -07:00
iio_simple_dummy.c staging:iio:dummy Add buffered reading support 2011-10-17 15:36:30 -07:00
iio_simple_dummy.h staging:iio:dummy Add buffered reading support 2011-10-17 15:36:30 -07:00
iio_simple_dummy_buffer.c staging: Add export.h for THIS_MODULE/EXPORT_SYMBOL to drivers/staging users. 2011-10-31 19:32:08 -04:00
iio_simple_dummy_events.c staging:iio:dummy Add event support + fake event generator 2011-10-17 15:36:30 -07:00
industrialio-buffer.c staging: Add export.h for THIS_MODULE/EXPORT_SYMBOL to drivers/staging users. 2011-10-31 19:32:08 -04:00
industrialio-core.c staging:iio: fix removal path to allow correct freeing. 2011-10-17 15:34:53 -07:00
industrialio-trigger.c staging:iio:core:naming: dev_info to indio_dev for consistency 2011-10-11 09:58:58 -06:00
kfifo_buf.c staging:iio: replacing term ring with buffer in the IIO core. 2011-09-26 17:31:53 -07:00
kfifo_buf.h staging:iio: replacing term ring with buffer in the IIO core. 2011-09-26 17:31:53 -07:00
ring_hw.h staging:iio: replacing term ring with buffer in the IIO core. 2011-09-26 17:31:53 -07:00
ring_sw.c staging:iio: replacing term ring with buffer in the IIO core. 2011-09-26 17:31:53 -07:00
ring_sw.h staging:iio: replacing term ring with buffer in the IIO core. 2011-09-26 17:31:53 -07:00
sysfs.h staging:iio:tree wide. abi fixup for in_ out_ prefix introduction. 2011-09-16 20:32:00 +02:00
trigger.h treewide: use __printf not __attribute__((format(printf,...))) 2011-10-31 17:30:54 -07:00
trigger_consumer.h staging:iio: treewide rename iio_triggered_ring_* to iio_triggered_buffer_* 2011-09-26 17:31:52 -07:00