linux/drivers/input/touchscreen
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
..
88pm860x-ts.c
ad7877.c drivers/input: Add module.h to modular drivers implicitly using it 2011-10-31 19:31:16 -04:00
ad7879-i2c.c Input: ad7879-i2c - wrap suspend and resume in CONFIG_PM_SLEEP 2011-10-06 19:43:05 -07:00
ad7879-spi.c drivers/input: Add module.h to modular drivers implicitly using it 2011-10-31 19:31:16 -04:00
ad7879.c drivers/input: Add module.h to modular drivers implicitly using it 2011-10-31 19:31:16 -04:00
ad7879.h
ads7846.c drivers/input: Add module.h to modular drivers implicitly using it 2011-10-31 19:31:16 -04:00
atmel-wm97xx.c
atmel_mxt_ts.c
atmel_tsadcc.c
bu21013_ts.c drivers/input: Add module.h to modular drivers implicitly using it 2011-10-31 19:31:16 -04:00
cy8ctmg110_ts.c
da9034-ts.c
dynapro.c
eeti_ts.c
elo.c
fujitsu_ts.c
gunze.c
h3600_ts_input.c
hampshire.c
hp680_ts_input.c
htcpen.c
inexio.c
intel-mid-touch.c
jornada720_ts.c
Kconfig
lpc32xx_ts.c
mainstone-wm97xx.c
Makefile
max11801_ts.c
mc13783_ts.c input: Convert mc13783-ts to mc13xxx API 2011-10-24 14:09:12 +02:00
mcs5000_ts.c
migor_ts.c
mk712.c
mtouch.c
pcap_ts.c
penmount.c
s3c2410_ts.c
st1232.c
stmpe-ts.c
tnetv107x-ts.c
touchit213.c
touchright.c
touchwin.c
tps6507x-ts.c
tsc40.c
tsc2005.c
tsc2007.c Input: tsc2007 - make sure that X plate resistance is specified 2011-10-11 20:56:41 -07:00
ucb1400_ts.c
usbtouchscreen.c
w90p910_ts.c
wacom_w8001.c Merge branch 'next' into for-linus 2011-10-26 21:46:20 -07:00
wm97xx-core.c
wm831x-ts.c
wm9705.c
wm9712.c
wm9713.c
zylonite-wm97xx.c