kernel: refresh patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 43564
This commit is contained in:
@@ -97,11 +97,10 @@ Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
|
||||
};
|
||||
|
||||
uart4 {
|
||||
@@ -1106,6 +1157,15 @@
|
||||
>;
|
||||
@@ -1107,6 +1158,15 @@
|
||||
};
|
||||
};
|
||||
+
|
||||
|
||||
+ uart5 {
|
||||
+ pinctrl_uart5_1: uart5grp-1 {
|
||||
+ fsl,pins = <
|
||||
@@ -110,6 +109,7 @@ Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
|
||||
+ >;
|
||||
+ };
|
||||
+ };
|
||||
|
||||
+
|
||||
usbotg {
|
||||
pinctrl_usbotg_1: usbotggrp-1 {
|
||||
fsl,pins = <
|
||||
|
||||
@@ -241,7 +241,7 @@ Date: Thu May 15 12:36:23 2014 -0700
|
||||
#ifdef CONFIG_IGB_HWMON
|
||||
igb_sysfs_exit(adapter);
|
||||
#endif
|
||||
@@ -3038,6 +3170,12 @@ static int __igb_open(struct net_device
|
||||
@@ -3038,6 +3170,12 @@ static int __igb_open(struct net_device
|
||||
if (!resuming)
|
||||
pm_runtime_put(&pdev->dev);
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/drivers/net/phy/Kconfig
|
||||
+++ b/drivers/net/phy/Kconfig
|
||||
@@ -270,6 +270,14 @@ endif # RTL8366_SMI
|
||||
@@ -278,6 +278,14 @@ endif # RTL8366_SMI
|
||||
|
||||
source "drivers/net/phy/b53/Kconfig"
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
config MICREL_KS8995MA
|
||||
--- a/drivers/net/phy/Makefile
|
||||
+++ b/drivers/net/phy/Makefile
|
||||
@@ -39,6 +39,7 @@ obj-$(CONFIG_NATIONAL_PHY) += national.o
|
||||
@@ -40,6 +40,7 @@ obj-$(CONFIG_NATIONAL_PHY) += national.o
|
||||
obj-$(CONFIG_DP83640_PHY) += dp83640.o
|
||||
obj-$(CONFIG_STE10XP) += ste10Xp.o
|
||||
obj-$(CONFIG_MICREL_PHY) += micrel.o
|
||||
|
||||
Reference in New Issue
Block a user