diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2014-02-23 10:59:40 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2014-02-23 10:59:40 +0000 |
| commit | a73d292127dd4e60f2003c476b68a1782afaee4b (patch) | |
| tree | 6893168321baffe3f667d58069ad8717ff714e42 /target/linux/mvebu/patches-3.10/0183-of-irq-Rename-of_irq_map_-functions-to-of_irq_parse_.patch | |
| parent | ad705417a3d3a154cb5c2605c98081ba0df83329 (diff) | |
| download | master-187ad058-a73d292127dd4e60f2003c476b68a1782afaee4b.tar.gz master-187ad058-a73d292127dd4e60f2003c476b68a1782afaee4b.tar.bz2 master-187ad058-a73d292127dd4e60f2003c476b68a1782afaee4b.zip | |
kernel: update 3.10 to 3.10.32
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39707 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/mvebu/patches-3.10/0183-of-irq-Rename-of_irq_map_-functions-to-of_irq_parse_.patch')
| -rw-r--r-- | target/linux/mvebu/patches-3.10/0183-of-irq-Rename-of_irq_map_-functions-to-of_irq_parse_.patch | 2 |
1 files changed, 1 insertions, 1 deletions
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 5007d9164d..c0245b7081 100644 --- 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", |