refresh patches

SVN-Revision: 13397
v19.07.3_mercusys_ac12_duma
Gabor Juhos 16 years ago
parent 3376b8d890
commit c79c1efd27

@ -13,7 +13,7 @@
config USB_EHCI_FSL config USB_EHCI_FSL
bool "Support for Freescale on-chip EHCI USB controller" bool "Support for Freescale on-chip EHCI USB controller"
depends on USB_EHCI_HCD && FSL_SOC depends on USB_EHCI_HCD && FSL_SOC
@@ -152,6 +158,12 @@ config USB_OHCI_HCD @@ -141,6 +147,12 @@ config USB_OHCI_HCD
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
module will be called ohci-hcd. module will be called ohci-hcd.
@ -28,7 +28,7 @@
depends on USB_OHCI_HCD && (STB03xxx || PPC_MPC52xx) depends on USB_OHCI_HCD && (STB03xxx || PPC_MPC52xx)
--- a/drivers/usb/host/ehci-hcd.c --- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c
@@ -1040,6 +1040,11 @@ MODULE_LICENSE ("GPL"); @@ -1039,6 +1039,11 @@ MODULE_LICENSE ("GPL");
#define PLATFORM_DRIVER ixp4xx_ehci_driver #define PLATFORM_DRIVER ixp4xx_ehci_driver
#endif #endif

@ -1,6 +1,6 @@
--- a/drivers/mtd/devices/m25p80.c --- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c
@@ -645,12 +645,17 @@ static int __devinit m25p_probe(struct s @@ -667,12 +667,17 @@ static int __devinit m25p_probe(struct s
struct mtd_partition *parts = NULL; struct mtd_partition *parts = NULL;
int nr_parts = 0; int nr_parts = 0;

@ -1,6 +1,6 @@
--- a/drivers/mtd/devices/m25p80.c --- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c
@@ -455,6 +455,9 @@ @@ -467,6 +467,9 @@ static struct flash_info __devinitdata m
{ "at26df161a", 0x1f4601, 64 * 1024, 32, SECT_4K, }, { "at26df161a", 0x1f4601, 64 * 1024, 32, SECT_4K, },
{ "at26df321", 0x1f4701, 64 * 1024, 64, SECT_4K, }, { "at26df321", 0x1f4701, 64 * 1024, 64, SECT_4K, },

@ -1,6 +1,6 @@
--- a/drivers/mtd/devices/m25p80.c --- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c
@@ -655,6 +655,9 @@ @@ -677,6 +677,9 @@ static int __devinit m25p_probe(struct s
#ifdef CONFIG_MTD_MYLOADER_PARTS #ifdef CONFIG_MTD_MYLOADER_PARTS
"MyLoader", "MyLoader",
#endif #endif

@ -1,6 +1,6 @@
--- a/drivers/net/ag71xx/ag71xx_phy.c --- a/drivers/net/ag71xx/ag71xx_phy.c
+++ b/drivers/net/ag71xx/ag71xx_phy.c +++ b/drivers/net/ag71xx/ag71xx_phy.c
@@ -171,12 +171,8 @@ static void ag71xx_phy_link_adjust(struc @@ -138,12 +138,8 @@ static void ag71xx_phy_link_adjust(struc
} }
} }

Loading…
Cancel
Save