Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
kernel-fxtec-pro1x/drivers/ide
History
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
..
aec62xx.c
ali14xx.c
alim15x3.c
amd74xx.c
at91_ide.c ARM: gpio: at91: convert drivers to use asm/gpio.h rather than mach/gpio.h 2011-08-08 14:27:48 +01:00
atiixp.c
au1xxx-ide.c MIPS: Alchemy: kill au1xxx.h header 2011-10-24 23:34:24 +01:00
buddha.c ide/ata: Add module.h to the implicit modular users 2011-10-31 19:31:37 -04:00
cmd64x.c
cmd640.c ide/ata: Add module.h to the implicit modular users 2011-10-31 19:31:37 -04:00
cs5520.c
cs5530.c
cs5535.c
cs5536.c
cy82c693.c drivers/ide/cy82c693.c: Add missing pci_dev_put 2011-08-04 01:30:34 -07:00
delkin_cb.c
dtc2278.c
falconide.c
gayle.c m68k: amiga - Amiga Gayle IDE platform device conversion 2010-05-26 19:51:09 +02:00
hpt366.c hpt366: fix clock turnaround 2010-10-26 10:17:29 -07:00
ht6560b.c Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
icside.c
ide-4drives.c
ide-acpi.c ide/ata: Add module.h to the implicit modular users 2011-10-31 19:31:37 -04:00
ide-atapi.c ide/ata: Add export.h for EXPORT_SYMBOL/THIS_MODULE where needed 2011-10-31 19:31:37 -04:00
ide-cd.c ide-cd: signedness warning fix again 2011-06-11 15:06:48 -07:00
ide-cd.h ide: Convert to bdops->check_events() 2011-03-09 19:54:27 +01:00
ide-cd_ioctl.c ide: unexport DISK_EVENT_MEDIA_CHANGE for ide-gd and ide-cd 2011-04-21 19:43:59 +02:00
ide-cd_verbose.c
ide-cs.c pcmcia: Convert pcmcia_device_id declarations to const 2011-05-06 07:46:22 +02:00
ide-devsets.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
ide-disk.c ide-disk: Fix request requeuing 2011-10-03 14:28:18 -04:00
ide-disk.h
ide-disk_ioctl.c block: autoconvert trivial BKL users to private mutex 2010-10-05 15:01:10 +02:00
ide-disk_proc.c ide/ata: Add export.h for EXPORT_SYMBOL/THIS_MODULE where needed 2011-10-31 19:31:37 -04:00
ide-dma-sff.c ide/ata: Add export.h for EXPORT_SYMBOL/THIS_MODULE where needed 2011-10-31 19:31:37 -04:00
ide-dma.c ide/ata: Add export.h for EXPORT_SYMBOL/THIS_MODULE where needed 2011-10-31 19:31:37 -04:00
ide-eh.c ide/ata: Add export.h for EXPORT_SYMBOL/THIS_MODULE where needed 2011-10-31 19:31:37 -04:00
ide-floppy.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6 2011-05-22 22:08:32 -07:00
ide-floppy.h
ide-floppy_ioctl.c block: autoconvert trivial BKL users to private mutex 2010-10-05 15:01:10 +02:00
ide-floppy_proc.c ide/ata: Add export.h for EXPORT_SYMBOL/THIS_MODULE where needed 2011-10-31 19:31:37 -04:00
ide-gd.c ide: unexport DISK_EVENT_MEDIA_CHANGE for ide-gd and ide-cd 2011-04-21 19:43:59 +02:00
ide-gd.h
ide-generic.c
ide-h8300.c
ide-io-std.c ide/ata: Add export.h for EXPORT_SYMBOL/THIS_MODULE where needed 2011-10-31 19:31:37 -04:00
ide-io.c ide: always ensure that blk_delay_queue() is called if we have pending IO 2011-04-05 23:52:49 +02:00
ide-ioctls.c ide/ata: Add export.h for EXPORT_SYMBOL/THIS_MODULE where needed 2011-10-31 19:31:37 -04:00
ide-iops.c
ide-legacy.c ide/ata: Add export.h for EXPORT_SYMBOL/THIS_MODULE where needed 2011-10-31 19:31:37 -04:00
ide-lib.c ide/ata: Add export.h for EXPORT_SYMBOL/THIS_MODULE where needed 2011-10-31 19:31:37 -04:00
ide-park.c block: remove per-queue plugging 2011-03-10 08:52:07 +01:00
ide-pci-generic.c
ide-pio-blacklist.c
ide-pm.c block: remove wrappers for request type/flags 2010-08-07 18:17:56 +02:00
ide-pnp.c ide/ata: Add module.h to the implicit modular users 2011-10-31 19:31:37 -04:00
ide-probe.c ide: Fix ordering of procfs registry. 2010-09-13 21:34:25 -07:00
ide-proc.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
ide-scan-pci.c ide/ide-scan-pci.c: Use for_each_pci_dev(). 2011-05-16 14:24:46 -07:00
ide-sysfs.c
ide-tape.c Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl 2010-10-22 10:52:56 -07:00
ide-taskfile.c ide/ata: Add export.h for EXPORT_SYMBOL/THIS_MODULE where needed 2011-10-31 19:31:37 -04:00
ide-timings.c
ide-xfer-mode.c ide/ata: Add export.h for EXPORT_SYMBOL/THIS_MODULE where needed 2011-10-31 19:31:37 -04:00
ide.c ide: use module_param_named rather than module_param_call 2010-08-11 23:04:39 +09:30
ide_platform.c ide: Fix irq flags madness 2011-08-04 01:29:51 -07:00
it821x.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
it8172.c
it8213.c
jmicron.c
Kconfig Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 2011-11-03 13:28:14 -07:00
macide.c ide/ata: Add module.h to the implicit modular users 2011-10-31 19:31:37 -04:00
Makefile ide: change to new flag variable 2011-03-17 14:05:34 +01:00
ns87415.c
opti621.c
palm_bk3710.c treewide: Convert uses of struct resource to resource_size(ptr) 2011-06-10 14:55:36 +02:00
pdc202xx_new.c
pdc202xx_old.c pdc202xx_old: ignore "FIFO empty" bit in test_irq() method 2010-04-22 19:11:24 -07:00
piix.c Fix common misspellings 2011-03-31 11:26:23 -03:00
pmac.c ide/ata: Add module.h to the implicit modular users 2011-10-31 19:31:37 -04:00
q40ide.c ide/ata: Add module.h to the implicit modular users 2011-10-31 19:31:37 -04:00
qd65xx.c
qd65xx.h
rapide.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
rz1000.c
sc1200.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
scc_pata.c
serverworks.c
setup-pci.c ide/ata: Add export.h for EXPORT_SYMBOL/THIS_MODULE where needed 2011-10-31 19:31:37 -04:00
sgiioc4.c
siimage.c
sis5513.c Fix common misspellings 2011-03-31 11:26:23 -03:00
sl82c105.c
slc90e66.c
tc86c001.c ide/ata: Add module.h to the implicit modular users 2011-10-31 19:31:37 -04:00
triflex.c Fix common misspellings 2011-03-31 11:26:23 -03:00
trm290.c
tx4938ide.c tx493xide: use min_t() macro instead of min() 2010-08-09 03:17:55 -07:00
tx4939ide.c treewide: Convert uses of struct resource to resource_size(ptr) 2011-06-10 14:55:36 +02:00
umc8672.c
via82cxxx.c Fix common misspellings 2011-03-31 11:26:23 -03:00