kernel: update linux 3.7 to 3.7.2

[openwrt/openwrt.git] / target / linux / generic / patches-3.7 / 131-atm-fixes.patch

diff --git a/target/linux/generic/patches-3.7/131-atm-fixes.patch b/target/linux/generic/patches-3.7/131-atm-fixes.patch
index 4cc3e57087fa73216941e5bc8055890224b88a45..64e50b39402e9a2082257cde24dfc2979fcfe8be 100644 (file)
--- a/target/linux/generic/patches-3.7/131-atm-fixes.patch
+++ b/target/linux/generic/patches-3.7/131-atm-fixes.patch
@@ -452,7 +452,7 @@ Date:   Sun Nov 25 12:06:52 2012 +0000
        return;
  }
  
-@@ -1011,9 +989,12 @@ static uint32_t fpga_tx(struct solos_car
+@@ -1012,9 +990,12 @@ static uint32_t fpga_tx(struct solos_car
                        if (vcc) {
                                atomic_inc(&vcc->stats->tx);
                                solos_pop(vcc, oldskb);
@@ -467,7 +467,7 @@ Date:   Sun Nov 25 12:06:52 2012 +0000
                }
        }
        /* For non-DMA TX, write the 'TX start' bit for all four ports simultaneously */
-@@ -1248,7 +1229,7 @@ static int atm_init(struct solos_card *c
+@@ -1249,7 +1230,7 @@ static int atm_init(struct solos_card *c
                card->atmdev[i]->phy_data = (void *)(unsigned long)i;
                atm_dev_signal_change(card->atmdev[i], ATM_PHY_SIG_FOUND);
  
@@ -476,7 +476,7 @@ Date:   Sun Nov 25 12:06:52 2012 +0000
                if (!skb) {
                        dev_warn(&card->dev->dev, "Failed to allocate sk_buff in atm_init()\n");
                        continue;
-@@ -1345,6 +1326,8 @@ static struct pci_driver fpga_driver = {
+@@ -1346,6 +1327,8 @@ static struct pci_driver fpga_driver = {
  
  static int __init solos_pci_init(void)
  {