iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/drivers/ide
History
Linus Torvalds d6748066ad Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (37 commits)
  MIPS: O32: Provide definition of registers ta0 .. ta3.
  MIPS: perf: Add Octeon support for hardware perf.
  MIPS: perf: Add support for 64-bit perf counters.
  MIPS: perf: Reorganize contents of perf support files.
  MIPS: perf: Cleanup formatting in arch/mips/kernel/perf_event.c
  MIPS: Add accessor macros for 64-bit performance counter registers.
  MIPS: Add probes for more Octeon II CPUs.
  MIPS: Add more CPU identifiers for Octeon II CPUs.
  MIPS: XLR, XLS: Add comment for smp setup
  MIPS: JZ4740: GPIO: Check correct IRQ in demux handler
  MIPS: JZ4740: GPIO: Simplify IRQ demuxer
  MIPS: JZ4740: Use generic irq chip
  MIPS: Alchemy: remove all CONFIG_SOC_AU1??? defines
  MIPS: Alchemy: kill au1xxx.h header
  MIPS: Alchemy: clean DMA code of CONFIG_SOC_AU1??? defines
  MIPS, IDE: Alchem, au1xxx-ide: Remove pb1200/db1200 header dep
  MIPS: Alchemy: Redo PCI as platform driver
  MIPS: Alchemy: more base address cleanup
  MIPS: Alchemy: rewrite USB platform setup.
  MIPS: Alchemy: abstract USB block control register access
  ...

Fix up trivial conflicts in:
	arch/mips/alchemy/devboards/db1x00/platform.c
	drivers/ide/Kconfig
	drivers/mmc/host/au1xmmc.c
	drivers/video/Kconfig
	sound/mips/Kconfig
2011-11-03 13:28:14 -07:00
..
aec62xx.c
ide: change ->set_dma_mode method parameters
2010-01-19 01:45:29 -08:00
ali14xx.c
ide: change ->set_pio_mode method parameters
2010-01-19 01:44:41 -08:00
alim15x3.c
alim15x3: fix handling of UDMA enable bit
2010-01-19 01:52:31 -08:00
amd74xx.c
amd74xx: use ->pio_mode value to determine pair device speed
2010-01-19 01:52:32 -08:00
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
ide: change ->set_dma_mode method parameters
2010-01-19 01:45:29 -08:00
au1xxx-ide.c
MIPS: Alchemy: kill au1xxx.h header
2011-10-24 23:34:24 +01:00
buddha.c
ide: move ack_intr() method into 'struct ide_port_ops' (take 2)
2009-06-15 18:52:58 +02:00
cmd64x.c
cmd64x: fix handling of address setup timings
2010-01-19 01:52:32 -08:00
cmd640.c
cmd640: fix kernel oops in test_irq() method
2010-05-11 00:08:03 -07:00
cs5520.c
ide: change ->set_dma_mode method parameters
2010-01-19 01:45:29 -08:00
cs5530.c
ide: change ->set_dma_mode method parameters
2010-01-19 01:45:29 -08:00
cs5535.c
cs5535: use ->pio_mode value to determine pair device speed
2010-01-19 01:52:33 -08:00
cs5536.c
cs5536: use ->pio_mode value to determine pair device speed
2010-01-19 01:52:33 -08:00
cy82c693.c
drivers/ide/cy82c693.c: Add missing pci_dev_put
2011-08-04 01:30:34 -07:00
delkin_cb.c
ide: remove hw_regs_t typedef
2009-05-17 19:12:25 +02:00
dtc2278.c
ide: change ->set_pio_mode method parameters
2010-01-19 01:44:41 -08:00
falconide.c
ide: move ack_intr() method into 'struct ide_port_ops' (take 2)
2009-06-15 18:52:58 +02:00
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
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ide-2.6
2010-03-02 23:57:59 -08:00
ide_platform.c
ide: Fix irq flags madness
2011-08-04 01:29:51 -07:00
ide-4drives.c
ide: remove hw_regs_t typedef
2009-05-17 19:12:25 +02:00
ide-acpi.c
ide: fix use after free in ide-acpi
2010-11-22 11:37:21 -08:00
ide-atapi.c
block: remove per-queue plugging
2011-03-10 08:52:07 +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-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-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_ioctl.c
block: autoconvert trivial BKL users to private mutex
2010-10-05 15:01:10 +02:00
ide-disk_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-disk.c
ide-disk: Fix request requeuing
2011-10-03 14:28:18 -04:00
ide-disk.h
…
ide-dma-sff.c
ide: remove wmb() from ide-dma-sff.c and scc_pata.c
2009-04-08 14:12:49 +02:00
ide-dma.c
ide: clean up timed out request handling
2010-10-26 10:17:30 -07:00
ide-eh.c
block: remove wrappers for request type/flags
2010-08-07 18:17:56 +02:00
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: convert to ->proc_fops
2009-09-01 17:52:57 -07: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-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: move ->failed_pc to ide_drive_t
2009-03-27 12:46:34 +01:00
ide-generic.c
ide: remove hw_regs_t typedef
2009-05-17 19:12:25 +02:00
ide-h8300.c
ide: remove hw_regs_t typedef
2009-05-17 19:12:25 +02:00
ide-io-std.c
ide: refactor tf_read() method
2009-04-08 14:13:03 +02: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
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-iops.c
ide: add SATA cable detection support
2010-01-19 01:41:57 -08:00
ide-legacy.c
ide: remove hw_regs_t typedef
2009-05-17 19:12:25 +02:00
ide-lib.c
Merge branch 'master' into for-2.6.31
2009-05-22 20:28:35 +02:00
ide-park.c
block: remove per-queue plugging
2011-03-10 08:52:07 +01:00
ide-pci-generic.c
pata_piccolo: Driver for old Toshiba chipsets
2009-12-03 14:35:31 -05:00
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: remove hw_regs_t typedef
2009-05-17 19:12:25 +02: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: move sysfs support to ide-sysfs.c
2009-01-02 16:12:48 +01:00
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
Fix common misspellings
2011-03-31 11:26:23 -03:00
ide-timings.c
ide: ide_timing_compute() fixup
2010-01-19 11:30:09 -08:00
ide-xfer-mode.c
ide: make ide_get_best_pio_mode() static
2010-01-19 01:52:36 -08:00
ide.c
ide: use module_param_named rather than module_param_call
2010-08-11 23:04:39 +09:30
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
ide: change ->set_dma_mode method parameters
2010-01-19 01:45:29 -08:00
it8213.c
ide: change ->set_dma_mode method parameters
2010-01-19 01:45:29 -08:00
jmicron.c
ide: change ->set_dma_mode method parameters
2010-01-19 01:45:29 -08:00
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: move ack_intr() method into 'struct ide_port_ops' (take 2)
2009-06-15 18:52:58 +02:00
Makefile
ide: change to new flag variable
2011-03-17 14:05:34 +01:00
ns87415.c
ide: refactor tf_read() method
2009-04-08 14:13:03 +02:00
opti621.c
ide: change ->set_pio_mode method parameters
2010-01-19 01:44:41 -08:00
palm_bk3710.c
treewide: Convert uses of struct resource to resource_size(ptr)
2011-06-10 14:55:36 +02:00
pdc202xx_new.c
ide: change ->set_dma_mode method parameters
2010-01-19 01:45:29 -08:00
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
drivers/ide/pmac.c: Remove unnecessary casts of pci_get_drvdata
2010-11-22 11:38:08 -08:00
q40ide.c
ide: move ack_intr() method into 'struct ide_port_ops' (take 2)
2009-06-15 18:52:58 +02:00
qd65xx.c
ide: change ->set_pio_mode method parameters
2010-01-19 01:44:41 -08:00
qd65xx.h
ide: do not access ide_drive_t 'drive_data' field directly
2009-06-15 22:13:44 +02:00
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
rz1000: apply chipset quirks early (v2)
2008-12-29 20:27:33 +01:00
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
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ide-2.6
2010-03-02 23:57:59 -08:00
serverworks.c
ide: change ->set_dma_mode method parameters
2010-01-19 01:45:29 -08:00
setup-pci.c
ide: re-implement ide_pci_init_one() on top of ide_pci_init_two()
2009-06-10 14:37:21 +02:00
sgiioc4.c
ide: change ->set_dma_mode method parameters
2010-01-19 01:45:29 -08:00
siimage.c
siimage: use ->pio_mode value to determine pair device speed
2010-01-19 01:52:35 -08:00
sis5513.c
Fix common misspellings
2011-03-31 11:26:23 -03:00
sl82c105.c
ide: change ->set_dma_mode method parameters
2010-01-19 01:45:29 -08:00
slc90e66.c
ide: change ->set_dma_mode method parameters
2010-01-19 01:45:29 -08:00
tc86c001.c
ide: change ->set_dma_mode method parameters
2010-01-19 01:45:29 -08:00
triflex.c
Fix common misspellings
2011-03-31 11:26:23 -03:00
trm290.c
ide: turn selectproc() method into dev_select() method (take 5)
2009-03-31 20:15:32 +02:00
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
ide: change ->set_pio_mode method parameters
2010-01-19 01:44:41 -08:00
via82cxxx.c
Fix common misspellings
2011-03-31 11:26:23 -03:00