diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-04 16:31:00 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-04 16:31:00 -0500 |
| commit | 20b0f65d35ae45d43f363ace3744a775a752d265 (patch) | |
| tree | 6085d058cb5ce12bc07368ed897c3689f5239389 /drivers/ide/pci/generic.c | |
| parent | 70077f2fab35ed3d73631fc47d8c572b560ecabd (diff) | |
| parent | 849138827c962589ac50496fa7feeb2a2d51b467 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
ide: make legacy IDE VLB modules check for the "probe" kernel params (v2)
ide: remove some obsoleted kernel params (v2)
ide/pci/delkin_cb.c: pci_module_init to pci_register_driver
scc_pata: bugfix for checking DMA IRQ status
ide: remove a ton of pointless #undef REALLY_SLOW_IO
siimage: DRAC4 note
adjust legacy IDE resource setting (v2)
ide: fix pmac breakage
ide-cs: Update device table
ide: ide_get_best_pio_mode() returns incorrect IORDY setting (take 2)
piix/slc90e66: more tuneproc() fixing (take 2)
ide: fix drive side 80c cable check, take 2
cmd64x: fix PIO mode setup (take 3)
alim15x3: fix PIO mode setup
Diffstat (limited to 'drivers/ide/pci/generic.c')
| -rw-r--r-- | drivers/ide/pci/generic.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c index b408c6c517ea..f2c5a141ca10 100644 --- a/drivers/ide/pci/generic.c +++ b/drivers/ide/pci/generic.c | |||
| @@ -21,8 +21,6 @@ | |||
| 21 | * are deemed to be part of the source code. | 21 | * are deemed to be part of the source code. |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #undef REALLY_SLOW_IO /* most systems can safely undef this */ | ||
| 25 | |||
| 26 | #include <linux/types.h> | 24 | #include <linux/types.h> |
| 27 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 28 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |