summaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu/patches-4.0/202-gpio_mvebu_add_limited_pwm_support.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2015-05-26 09:31:39 +0000
committerImre Kaloz <kaloz@openwrt.org>2015-05-26 09:31:39 +0000
commitf1ebb1dddd2db076ea12ffd54b0e360a6840a1f0 (patch)
treec5a2ccef186b9988ae014d1e67bfbd720c9b3de9 /target/linux/mvebu/patches-4.0/202-gpio_mvebu_add_limited_pwm_support.patch
parent588acc2cbae61c31b6eabd19e55fcb48c653d87a (diff)
downloadmaster-31e0f0ae-f1ebb1dddd2db076ea12ffd54b0e360a6840a1f0.tar.gz
master-31e0f0ae-f1ebb1dddd2db076ea12ffd54b0e360a6840a1f0.tar.bz2
master-31e0f0ae-f1ebb1dddd2db076ea12ffd54b0e360a6840a1f0.zip
mvebu: update Linux 4.0 patches
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> SVN-Revision: 45762
Diffstat (limited to 'target/linux/mvebu/patches-4.0/202-gpio_mvebu_add_limited_pwm_support.patch')
-rw-r--r--target/linux/mvebu/patches-4.0/202-gpio_mvebu_add_limited_pwm_support.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/mvebu/patches-4.0/202-gpio_mvebu_add_limited_pwm_support.patch b/target/linux/mvebu/patches-4.0/202-gpio_mvebu_add_limited_pwm_support.patch
index 535901dcd5..f1b868851a 100644
--- a/target/linux/mvebu/patches-4.0/202-gpio_mvebu_add_limited_pwm_support.patch
+++ b/target/linux/mvebu/patches-4.0/202-gpio_mvebu_add_limited_pwm_support.patch
@@ -299,7 +299,7 @@ Signed-off-by: Andrew Lunn <andrew@lunn.ch>
{
struct mvebu_gpio_chip *mvchip =
container_of(chip, struct mvebu_gpio_chip, chip);
-@@ -609,6 +592,8 @@ static int mvebu_gpio_suspend(struct pla
+@@ -617,6 +600,8 @@ static int mvebu_gpio_suspend(struct pla
BUG();
}
@@ -308,7 +308,7 @@ Signed-off-by: Andrew Lunn <andrew@lunn.ch>
return 0;
}
-@@ -652,6 +637,8 @@ static int mvebu_gpio_resume(struct plat
+@@ -660,6 +645,8 @@ static int mvebu_gpio_resume(struct plat
BUG();
}
@@ -317,7 +317,7 @@ Signed-off-by: Andrew Lunn <andrew@lunn.ch>
return 0;
}
-@@ -663,7 +650,6 @@ static int mvebu_gpio_probe(struct platf
+@@ -671,7 +658,6 @@ static int mvebu_gpio_probe(struct platf
struct resource *res;
struct irq_chip_generic *gc;
struct irq_chip_type *ct;
@@ -325,7 +325,7 @@ Signed-off-by: Andrew Lunn <andrew@lunn.ch>
unsigned int ngpios;
int soc_variant;
int i, cpu, id;
-@@ -693,10 +679,10 @@ static int mvebu_gpio_probe(struct platf
+@@ -701,10 +687,10 @@ static int mvebu_gpio_probe(struct platf
return id;
}
@@ -339,7 +339,7 @@ Signed-off-by: Andrew Lunn <andrew@lunn.ch>
mvchip->soc_variant = soc_variant;
mvchip->chip.label = dev_name(&pdev->dev);
-@@ -830,7 +816,8 @@ static int mvebu_gpio_probe(struct platf
+@@ -838,7 +824,8 @@ static int mvebu_gpio_probe(struct platf
goto err_generic_chip;
}