kernel: refresh patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 43564
This commit is contained in:
@@ -197,7 +197,7 @@
|
||||
}
|
||||
|
||||
|
||||
@@ -887,7 +913,9 @@ static int tulip_ethtool_set_wol(struct
|
||||
@@ -887,7 +913,9 @@ static int tulip_ethtool_set_wol(struct
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
tp->wolinfo.wolopts = wolinfo->wolopts;
|
||||
@@ -295,7 +295,7 @@
|
||||
.name = DRV_NAME,
|
||||
.id_table = tulip_pci_tbl,
|
||||
.probe = tulip_init_one,
|
||||
@@ -1974,10 +2014,12 @@ static struct pci_driver tulip_driver =
|
||||
@@ -1974,10 +2014,12 @@ static struct pci_driver tulip_driver =
|
||||
.resume = tulip_resume,
|
||||
#endif /* CONFIG_PM */
|
||||
};
|
||||
|
||||
@@ -122,7 +122,7 @@
|
||||
}
|
||||
|
||||
|
||||
@@ -916,6 +951,9 @@ static int tulip_ethtool_set_wol(struct
|
||||
@@ -916,6 +951,9 @@ static int tulip_ethtool_set_wol(struct
|
||||
#ifdef CONFIG_TULIP_PCI
|
||||
device_set_wakeup_enable(tp->kdev, tp->wolinfo.wolopts);
|
||||
#endif
|
||||
|
||||
@@ -266,7 +266,7 @@
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -573,8 +572,8 @@ pl010_console_write(struct console *co,
|
||||
@@ -573,8 +572,8 @@ pl010_console_write(struct console *co,
|
||||
/*
|
||||
* First save the CR then disable the interrupts
|
||||
*/
|
||||
@@ -277,7 +277,7 @@
|
||||
|
||||
uart_console_write(&uap->port, s, count, pl010_console_putchar);
|
||||
|
||||
@@ -583,10 +582,10 @@ pl010_console_write(struct console *co,
|
||||
@@ -583,10 +582,10 @@ pl010_console_write(struct console *co,
|
||||
* and restore the TCR
|
||||
*/
|
||||
do {
|
||||
|
||||
Reference in New Issue
Block a user