diff options
author | noz <noz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-05-16 19:25:20 +0000 |
---|---|---|
committer | noz <noz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-05-16 19:25:20 +0000 |
commit | a11dfce7a25fb7de61f3306c25d833710fdb316b (patch) | |
tree | 887dd555500536c150c4a656732da6bde9443082 /target/linux/brcm47xx/patches-2.6.25/410-aec62xx_pci_enable.patch | |
parent | c69fa28f0f3a6704f63e8b5316e5a292223f27d9 (diff) |
[generic-2.6] Remove files now present upstream in files-2.6.25
(This is mostly just drivers/ssb and include/linux/ssb)
[brcm47xx] Regenerate patches against 2.6.25.1 kernel+files set
Default is still to build against 2.6.23.16
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11155 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.25/410-aec62xx_pci_enable.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-2.6.25/410-aec62xx_pci_enable.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.25/410-aec62xx_pci_enable.patch b/target/linux/brcm47xx/patches-2.6.25/410-aec62xx_pci_enable.patch deleted file mode 100644 index ae2be766f9..0000000000 --- a/target/linux/brcm47xx/patches-2.6.25/410-aec62xx_pci_enable.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -Naur a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c ---- a/drivers/ide/pci/aec62xx.c 2007-10-12 18:43:44.000000000 +0200 -+++ b/drivers/ide/pci/aec62xx.c 2007-11-14 14:12:51.000000000 +0100 -@@ -248,7 +248,14 @@ - - static int __devinit init_setup_aec6x80(struct pci_dev *dev, ide_pci_device_t *d) - { -- unsigned long dma_base = pci_resource_start(dev, 4); -+ unsigned long dma_base; -+ int err; -+ -+ err = pci_enable_device(dev); -+ if (err) -+ return err; -+ -+ dma_base = pci_resource_start(dev, 4); - - if (inb(dma_base + 2) & 0x10) { - d->name = (dev->device == PCI_DEVICE_ID_ARTOP_ATP865R) ? -@@ -256,7 +263,11 @@ - d->udma_mask = 0x7f; /* udma0-6 */ - } - -- return ide_setup_pci_device(dev, d); -+ err = ide_setup_pci_device(dev, d); -+ if(err) -+ pci_disable_device(dev); -+ -+ return err; - } - - static ide_pci_device_t aec62xx_chipsets[] __devinitdata = { |