original_kernel/drivers/watchdog
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
..
Kconfig watchdog: Convert wm831x driver to watchdog core 2011-11-05 21:28:59 +01:00
Makefile
acquirewdt.c
advantechwdt.c
adx_wdt.c
alim1535_wdt.c
alim7101_wdt.c
ar7_wdt.c
at32ap700x_wdt.c
at91rm9200_wdt.c
at91sam9_wdt.c
at91sam9_wdt.h
ath79_wdt.c
bcm47xx_wdt.c
bcm63xx_wdt.c
bfin_wdt.c
booke_wdt.c
coh901327_wdt.c watchdog: irq: Remove IRQF_DISABLED 2011-11-05 21:16:15 +01:00
cpu5wdt.c
cpwd.c
davinci_wdt.c
dw_wdt.c
ep93xx_wdt.c
eurotechwdt.c watchdog: irq: Remove IRQF_DISABLED 2011-11-05 21:16:15 +01:00
f71808e_wdt.c
gef_wdt.c
geodewdt.c
hpwdt.c
i6300esb.c
iTCO_vendor.h
iTCO_vendor_support.c
iTCO_wdt.c watchdog: iTCO_wdt.c - problems with newer hardware due to SMI clearing 2011-11-05 21:22:06 +01:00
ib700wdt.c
ibmasr.c
imx2_wdt.c
indydog.c
intel_scu_watchdog.c
intel_scu_watchdog.h
iop_wdt.c
it87_wdt.c
it8712f_wdt.c
ixp4xx_wdt.c
ixp2000_wdt.c
jz4740_wdt.c
ks8695_wdt.c
lantiq_wdt.c
m54xx_wdt.c
machzwd.c
max63xx_wdt.c
mixcomwd.c
mpc8xxx_wdt.c
mpcore_wdt.c watchdog: irq: Remove IRQF_DISABLED 2011-11-05 21:16:15 +01:00
mtx-1_wdt.c
mv64x60_wdt.c
nuc900_wdt.c
nv_tco.c
nv_tco.h
octeon-wdt-main.c watchdog: Octeon: Mark octeon_wdt interrupt as IRQF_NO_THREAD 2011-11-05 21:15:38 +01:00
octeon-wdt-nmi.S
of_xilinx_wdt.c
omap_wdt.c
omap_wdt.h
orion_wdt.c
pc87413_wdt.c
pcwd.c
pcwd_pci.c
pcwd_usb.c
pika_wdt.c
pnx833x_wdt.c
pnx4008_wdt.c
rc32434_wdt.c
rdc321x_wdt.c
riowd.c
s3c2410_wdt.c watchdog: s3c2410: convert to use the watchdog framework 2011-11-05 21:25:20 +01:00
sa1100_wdt.c
sb_wdog.c watchdog: irq: Remove IRQF_DISABLED 2011-11-05 21:16:15 +01:00
sbc60xxwdt.c
sbc7240_wdt.c
sbc8360.c
sbc_epx_c3.c
sbc_fitpc2_wdt.c
sc520_wdt.c watchdog: sc520_wdt: Remove unnecessary cast. 2011-11-05 21:15:10 +01:00
sc1200wdt.c
sch311x_wdt.c
scx200_wdt.c
shwdt.c
smsc37b787_wdt.c
softdog.c
sp805_wdt.c
sp5100_tco.c
sp5100_tco.h
stmp3xxx_wdt.c watchdog: Add module.h to drivers/watchdog/stmp3xxx_wdt.c 2011-10-31 19:32:22 -04:00
ts72xx_wdt.c
twl4030_wdt.c
txx9wdt.c
w83627hf_wdt.c watchdog: Add WDIOC_GETTIMELEFT ioctl support to w83627 watchdog driver 2011-11-05 21:16:39 +01:00
w83697hf_wdt.c
w83697ug_wdt.c
w83877f_wdt.c
w83977f_wdt.c
wafer5823wdt.c
watchdog_core.c
watchdog_dev.c
watchdog_dev.h
wd501p.h
wdrtas.c
wdt.c watchdog: irq: Remove IRQF_DISABLED 2011-11-05 21:16:15 +01:00
wdt285.c
wdt977.c
wdt_pci.c watchdog: irq: Remove IRQF_DISABLED 2011-11-05 21:16:15 +01:00
wm831x_wdt.c watchdog: Convert wm831x driver to watchdog core 2011-11-05 21:28:59 +01:00
wm8350_wdt.c
xen_wdt.c