kernel: update 3.10 to 3.10.32

[openwrt.git] / target / linux / mvebu / patches-3.10 / 0183-of-irq-Rename-of_irq_map_-functions-to-of_irq_parse_.patch

diff --git a/target/linux/mvebu/patches-3.10/0183-of-irq-Rename-of_irq_map_-functions-to-of_irq_parse_.patch b/target/linux/mvebu/patches-3.10/0183-of-irq-Rename-of_irq_map_-functions-to-of_irq_parse_.patch
index 5007d91..c0245b7 100644 (file)
--- a/target/linux/mvebu/patches-3.10/0183-of-irq-Rename-of_irq_map_-functions-to-of_irq_parse_.patch
+++ b/target/linux/mvebu/patches-3.10/0183-of-irq-Rename-of_irq_map_-functions-to-of_irq_parse_.patch
@@ -468,7 +468,7 @@ Conflicts:
  
 --- a/drivers/of/address.c
 +++ b/drivers/of/address.c
-@@ -524,12 +524,12 @@ static u64 __of_translate_address(struct
+@@ -525,12 +525,12 @@ static u64 __of_translate_address(struct
                pbus->count_cells(dev, &pna, &pns);
                if (!OF_CHECK_COUNTS(pna, pns)) {
                        printk(KERN_ERR "prom_parse: Bad cell count for %s\n",