[kernel] generic-2.6: Backport netfilter includes fix from 2.6.26 to 2.6.25

[openwrt.git] / target / linux / brcm-2.4 / patches / 012-aec62xx.patch

diff --git a/target/linux/brcm-2.4/patches/012-aec62xx.patch b/target/linux/brcm-2.4/patches/012-aec62xx.patch
index 75d7d72..b0cc812 100644 (file)
--- a/target/linux/brcm-2.4/patches/012-aec62xx.patch
+++ b/target/linux/brcm-2.4/patches/012-aec62xx.patch
@@ -1,5 +1,7 @@
---- linux-2.4.34/drivers/ide/pci/aec62xx.c.old  2006-12-23 22:34:20.000000000 +0200
-+++ linux-2.4.34/drivers/ide/pci/aec62xx.c      2007-01-14 12:06:05.000000000 +0200
+Index: linux-2.4.35.4/drivers/ide/pci/aec62xx.c
+===================================================================
+--- linux-2.4.35.4.orig/drivers/ide/pci/aec62xx.c
++++ linux-2.4.35.4/drivers/ide/pci/aec62xx.c

 @@ -3,6 +3,8 @@
   *
   * Copyright (C) 1999-2002    Andre Hedrick <andre@linux-ide.org>
 @@ -3,6 +3,8 @@
   *
   * Copyright (C) 1999-2002    Andre Hedrick <andre@linux-ide.org>


@@ -9,20 +11,19 @@
   */
  
  #include <linux/module.h>
   */
  
  #include <linux/module.h>

-@@ -329,7 +331,11 @@
+@@ -329,7 +331,11 @@ static int aec62xx_config_drive_xfer_rat

        ide_hwif_t *hwif        = HWIF(drive);
        struct hd_driveid *id   = drive->id;
  
        ide_hwif_t *hwif        = HWIF(drive);
        struct hd_driveid *id   = drive->id;
  

--      if ((id->capability & 1) && drive->autodma) {

 +#ifndef CONFIG_BCM947XX
 +#ifndef CONFIG_BCM947XX

-+      if ((id->capability & 1) && drive->autodma) {
+       if ((id->capability & 1) && drive->autodma) {

 +#else
 +      if (1) {
 +#endif
                /* Consult the list of known "bad" drives */
                if (hwif->ide_dma_bad_drive(drive))
                        goto fast_ata_pio;
 +#else
 +      if (1) {
 +#endif
                /* Consult the list of known "bad" drives */
                if (hwif->ide_dma_bad_drive(drive))
                        goto fast_ata_pio;

-@@ -414,10 +416,60 @@
+@@ -414,10 +420,60 @@ static unsigned int __init init_chipset_

  {
        int bus_speed = system_bus_clock();
  
  {
        int bus_speed = system_bus_clock();
  


@@ -83,7 +84,7 @@
  
  #if defined(DISPLAY_AEC62XX_TIMINGS) && defined(CONFIG_PROC_FS)
        aec_devs[n_aec_devs++] = dev;
  
  #if defined(DISPLAY_AEC62XX_TIMINGS) && defined(CONFIG_PROC_FS)
        aec_devs[n_aec_devs++] = dev;

-@@ -500,6 +552,7 @@
+@@ -500,6 +556,7 @@ static void __init init_setup_aec62xx (s

  
  static void __init init_setup_aec6x80 (struct pci_dev *dev, ide_pci_device_t *d)
  {
  
  static void __init init_setup_aec6x80 (struct pci_dev *dev, ide_pci_device_t *d)
  {


@@ -91,7 +92,7 @@
        unsigned long bar4reg = pci_resource_start(dev, 4);
  
        if (inb(bar4reg+2) & 0x10) {
        unsigned long bar4reg = pci_resource_start(dev, 4);
  
        if (inb(bar4reg+2) & 0x10) {

-@@ -512,6 +565,7 @@
+@@ -512,6 +569,7 @@ static void __init init_setup_aec6x80 (s

                        strcpy(d->name, "AEC6280R");
        }
  
                        strcpy(d->name, "AEC6280R");
        }