aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq/patches-4.1
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2015-08-05 13:55:14 +0000
committerJonas Gorski <jogo@openwrt.org>2015-08-05 13:55:14 +0000
commitcaa73eb95c490e850d517cb558e4161c2f06d86f (patch)
tree615a1a64e1cfaaf0220f5c9ae49d465ee8566168 /target/linux/lantiq/patches-4.1
parent0b15f91ed6d556aafcd56ffabb9da7ba83b317f5 (diff)
downloadupstream-caa73eb95c490e850d517cb558e4161c2f06d86f.tar.gz
upstream-caa73eb95c490e850d517cb558e4161c2f06d86f.tar.bz2
upstream-caa73eb95c490e850d517cb558e4161c2f06d86f.zip
kernel: update 4.1 to 4.1.4
Changelog: * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.4 Signed-off-by: Daniel Golle <daniel@makrotopia.org> [jogo: fix brcm2708 patches, refresh target patches] Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 46560
Diffstat (limited to 'target/linux/lantiq/patches-4.1')
-rw-r--r--target/linux/lantiq/patches-4.1/0030-GPIO-add-named-gpio-exports.patch4
-rw-r--r--target/linux/lantiq/patches-4.1/0032-USB-fix-roothub-for-IFXHCD.patch2
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/lantiq/patches-4.1/0030-GPIO-add-named-gpio-exports.patch b/target/linux/lantiq/patches-4.1/0030-GPIO-add-named-gpio-exports.patch
index a72a6dad68..6badfe30fa 100644
--- a/target/linux/lantiq/patches-4.1/0030-GPIO-add-named-gpio-exports.patch
+++ b/target/linux/lantiq/patches-4.1/0030-GPIO-add-named-gpio-exports.patch
@@ -109,7 +109,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
{
--- a/include/linux/gpio/consumer.h
+++ b/include/linux/gpio/consumer.h
-@@ -446,6 +446,7 @@ static inline int desc_to_gpio(const str
+@@ -461,6 +461,7 @@ static inline struct gpio_desc *devm_get
#if IS_ENABLED(CONFIG_GPIOLIB) && IS_ENABLED(CONFIG_GPIO_SYSFS)
@@ -117,7 +117,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
int gpiod_export(struct gpio_desc *desc, bool direction_may_change);
int gpiod_export_link(struct device *dev, const char *name,
struct gpio_desc *desc);
-@@ -454,6 +455,13 @@ void gpiod_unexport(struct gpio_desc *de
+@@ -469,6 +470,13 @@ void gpiod_unexport(struct gpio_desc *de
#else /* CONFIG_GPIOLIB && CONFIG_GPIO_SYSFS */
diff --git a/target/linux/lantiq/patches-4.1/0032-USB-fix-roothub-for-IFXHCD.patch b/target/linux/lantiq/patches-4.1/0032-USB-fix-roothub-for-IFXHCD.patch
index c32e2bb597..79c811705e 100644
--- a/target/linux/lantiq/patches-4.1/0032-USB-fix-roothub-for-IFXHCD.patch
+++ b/target/linux/lantiq/patches-4.1/0032-USB-fix-roothub-for-IFXHCD.patch
@@ -20,7 +20,7 @@ Subject: [PATCH 32/36] USB: fix roothub for IFXHCD
choice
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
-@@ -4314,7 +4314,7 @@ hub_port_init (struct usb_hub *hub, stru
+@@ -4298,7 +4298,7 @@ hub_port_init (struct usb_hub *hub, stru
udev->ttport = hdev->ttport;
} else if (udev->speed != USB_SPEED_HIGH
&& hdev->speed == USB_SPEED_HIGH) {