git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
ide
/
pci
/
sl82c105.c
diff --git
a/drivers/ide/pci/sl82c105.c
b/drivers/ide/pci/sl82c105.c
index
8a5c7b2
..
0b4b604
100644
(file)
--- a/
drivers/ide/pci/sl82c105.c
+++ b/
drivers/ide/pci/sl82c105.c
@@
-13,7
+13,6
@@
* -- Benjamin Herrenschmidt (01/11/03) benh@kernel.crashing.org
*/
* -- Benjamin Herrenschmidt (01/11/03) benh@kernel.crashing.org
*/
-#include <linux/config.h>
#include <linux/types.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/module.h>
#include <linux/kernel.h>
@@
-447,7
+446,6
@@
static void __devinit init_hwif_sl82c105(ide_hwif_t *hwif)
printk(" %s: Winbond 553 bridge revision %d, BM-DMA disabled\n",
hwif->name, rev);
} else {
printk(" %s: Winbond 553 bridge revision %d, BM-DMA disabled\n",
hwif->name, rev);
} else {
-#ifdef CONFIG_BLK_DEV_IDEDMA
dma_state |= 0x60;
hwif->atapi_dma = 1;
dma_state |= 0x60;
hwif->atapi_dma = 1;
@@
-468,7
+466,6
@@
static void __devinit init_hwif_sl82c105(ide_hwif_t *hwif)
if (hwif->mate)
hwif->serialized = hwif->mate->serialized = 1;
if (hwif->mate)
hwif->serialized = hwif->mate->serialized = 1;
-#endif /* CONFIG_BLK_DEV_IDEDMA */
}
hwif->OUTB(dma_state, hwif->dma_base + 2);
}
}
hwif->OUTB(dma_state, hwif->dma_base + 2);
}
@@
-489,7
+486,7
@@
static int __devinit sl82c105_init_one(struct pci_dev *dev, const struct pci_dev
}
static struct pci_device_id sl82c105_pci_tbl[] = {
}
static struct pci_device_id sl82c105_pci_tbl[] = {
- { PCI_
VENDOR_ID_WINBOND, PCI_DEVICE_ID_WINBOND_82C105, PCI_ANY_ID, PCI_ANY_ID, 0, 0
, 0},
+ { PCI_
DEVICE(PCI_VENDOR_ID_WINBOND, PCI_DEVICE_ID_WINBOND_82C105)
, 0},
{ 0, },
};
MODULE_DEVICE_TABLE(pci, sl82c105_pci_tbl);
{ 0, },
};
MODULE_DEVICE_TABLE(pci, sl82c105_pci_tbl);