linux-sg2042/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 include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
Kconfig Input: add a driver for TSC-40 serial touchscreen 2011-09-28 10:24:14 -07:00
Makefile Input: add a driver for TSC-40 serial touchscreen 2011-09-28 10:24:14 -07:00
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 Input: ad7879 - add open and close methods 2010-07-03 13:13:14 -07:00
ads7846.c drivers/input: Add module.h to modular drivers implicitly using it 2011-10-31 19:31:16 -04:00
atmel-wm97xx.c Input: wm97xx - remove redundant define 2011-07-04 19:31:28 -07:00
atmel_mxt_ts.c Input: atmel_mxt_ts - use snprintf for sysfs attribute show method 2011-10-06 19:41:52 -07:00
atmel_tsadcc.c Input: remove IRQF_DISABLED from drivers 2011-09-07 14:19:11 -07:00
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 Input: cy8ctmg110_ts - set reset_pin and irq_pin from platform data 2011-07-18 17:10:27 -07:00
da9034-ts.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
dynapro.c Input: add driver for Dynapro serial touchscreen 2009-10-26 11:01:30 -07:00
eeti_ts.c Input: eeti_ts - convert to dev_pm_ops 2011-01-06 23:02:57 -08:00
elo.c Input: elo - switch to using dev_xxx() when printing messages 2010-01-06 23:54:40 -08:00
fujitsu_ts.c get rid of input BIT* duplicate defines 2007-10-19 11:53:42 -07:00
gunze.c Input: remove CVS keywords 2008-05-20 12:17:39 -04:00
h3600_ts_input.c Input: remove IRQF_DISABLED from drivers 2011-09-07 14:19:11 -07:00
hampshire.c Input: add driver for hampshire serial touchscreens 2010-04-13 23:27:41 -07:00
hp680_ts_input.c Input: remove IRQF_DISABLED from drivers 2011-09-07 14:19:11 -07:00
htcpen.c Input: add HTC Shift Touchscreen Driver 2008-06-02 00:38:35 -04:00
inexio.c Input: Add driver for iNexio serial touchscreen. 2008-06-30 09:37:32 -04:00
intel-mid-touch.c Input: intel-mid-touch - remove pointless checking for variable 'found' 2011-07-18 17:10:41 -07:00
jornada720_ts.c Input: remove IRQF_DISABLED from drivers 2011-09-07 14:19:11 -07:00
lpc32xx_ts.c Input: remove IRQF_DISABLED from drivers 2011-09-07 14:19:11 -07:00
mainstone-wm97xx.c Input: wm97xx - remove redundant define 2011-07-04 19:31:28 -07:00
max11801_ts.c Input: max11801_ts - correct license statement 2011-08-20 14:39:53 -07:00
mc13783_ts.c input: Convert mc13783-ts to mc13xxx API 2011-10-24 14:09:12 +02:00
mcs5000_ts.c Input: mcs5000_ts - convert to dev_pm_ops 2011-01-06 23:03:03 -08:00
migor_ts.c Input: migor_ts - convert to dev_pm_ops 2011-01-06 23:03:07 -08:00
mk712.c Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
mtouch.c get rid of input BIT* duplicate defines 2007-10-19 11:53:42 -07:00
pcap_ts.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
penmount.c Input: penmount - simplify unregister procedure 2011-09-20 22:46:31 -07:00
s3c2410_ts.c Input: remove IRQF_DISABLED from drivers 2011-09-07 14:19:11 -07:00
st1232.c Input: add ST1232 touchscreen controller driver 2010-12-15 23:40:13 -08:00
stmpe-ts.c Input: stmpe-ts - return -ENOMEM when memory allocation fails 2010-09-05 12:09:12 -07:00
tnetv107x-ts.c Input: tnetv107x-ts - add missing include of linux/module.h 2011-08-21 12:49:41 -07:00
touchit213.c Input: add driver for Tabletkiosk Sahara TouchIT-213 touchscreen 2008-07-07 12:00:30 -04:00
touchright.c get rid of input BIT* duplicate defines 2007-10-19 11:53:42 -07:00
touchwin.c get rid of input BIT* duplicate defines 2007-10-19 11:53:42 -07:00
tps6507x-ts.c input/tps6507x-ts: use system_wq instead of dedicated workqueue 2011-01-26 12:12:50 +01:00
tsc40.c Input: add a driver for TSC-40 serial touchscreen 2011-09-28 10:24:14 -07:00
tsc2005.c Input: tsc2005 - fix locking issue 2011-03-23 23:50:36 -07:00
tsc2007.c Input: tsc2007 - make sure that X plate resistance is specified 2011-10-11 20:56:41 -07:00
ucb1400_ts.c Fix common misspellings 2011-03-31 11:26:23 -03:00
usbtouchscreen.c Input: usbtouchscreen - add support for LG Flatron T1710B 2010-11-22 12:01:13 -08:00
w90p910_ts.c Input: remove IRQF_DISABLED from drivers 2011-09-07 14:19:11 -07:00
wacom_w8001.c Merge branch 'next' into for-linus 2011-10-26 21:46:20 -07:00
wm97xx-core.c Fix common misspellings 2011-03-31 11:26:23 -03:00
wm831x-ts.c Input: wm831x-ts - move BTN_TOUCH reporting to data transfer 2011-04-27 23:12:22 -07:00
wm9705.c Input: wm97xx - mark channels which need pen_down 2011-07-04 19:31:47 -07:00
wm9712.c Input: wm97xx - mark channels which need pen_down 2011-07-04 19:31:47 -07:00
wm9713.c Input: wm97xx - mark channels which need pen_down 2011-07-04 19:31:47 -07:00
zylonite-wm97xx.c Input: wm97xx - remove redundant define 2011-07-04 19:31:28 -07:00