mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
linux: update 3.0 to 3.0.9
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29264 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -22,7 +22,7 @@
|
||||
depends on USB
|
||||
--- a/drivers/usb/host/ehci-hcd.c
|
||||
+++ b/drivers/usb/host/ehci-hcd.c
|
||||
@@ -1284,9 +1284,14 @@ MODULE_LICENSE ("GPL");
|
||||
@@ -1312,9 +1312,14 @@ MODULE_LICENSE ("GPL");
|
||||
#define PLATFORM_DRIVER ehci_grlib_driver
|
||||
#endif
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
#error "missing bus glue for ehci-hcd"
|
||||
#endif
|
||||
|
||||
@@ -1346,10 +1351,20 @@ static int __init ehci_hcd_init(void)
|
||||
@@ -1374,10 +1379,20 @@ static int __init ehci_hcd_init(void)
|
||||
if (retval < 0)
|
||||
goto clean4;
|
||||
#endif
|
||||
@@ -60,7 +60,7 @@
|
||||
clean4:
|
||||
#endif
|
||||
#ifdef OF_PLATFORM_DRIVER
|
||||
@@ -1380,6 +1395,9 @@ module_init(ehci_hcd_init);
|
||||
@@ -1408,6 +1423,9 @@ module_init(ehci_hcd_init);
|
||||
|
||||
static void __exit ehci_hcd_cleanup(void)
|
||||
{
|
||||
|
||||
@@ -152,7 +152,7 @@
|
||||
+#endif
|
||||
--- a/drivers/usb/host/ehci-hcd.c
|
||||
+++ b/drivers/usb/host/ehci-hcd.c
|
||||
@@ -1352,17 +1352,21 @@ static int __init ehci_hcd_init(void)
|
||||
@@ -1380,17 +1380,21 @@ static int __init ehci_hcd_init(void)
|
||||
goto clean4;
|
||||
#endif
|
||||
|
||||
@@ -174,7 +174,7 @@
|
||||
#ifdef XILINX_OF_PLATFORM_DRIVER
|
||||
platform_driver_unregister(&XILINX_OF_PLATFORM_DRIVER);
|
||||
clean4:
|
||||
@@ -1395,9 +1399,11 @@ module_init(ehci_hcd_init);
|
||||
@@ -1423,9 +1427,11 @@ module_init(ehci_hcd_init);
|
||||
|
||||
static void __exit ehci_hcd_cleanup(void)
|
||||
{
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/fs/fuse/dev.c
|
||||
+++ b/fs/fuse/dev.c
|
||||
@@ -647,11 +647,20 @@ static int fuse_copy_fill(struct fuse_co
|
||||
@@ -651,11 +651,20 @@ static int fuse_copy_fill(struct fuse_co
|
||||
return lock_request(cs->fc, cs->req);
|
||||
}
|
||||
|
||||
|
||||
@@ -145,7 +145,7 @@
|
||||
tw32(GRC_MODE, tp->grc_mode);
|
||||
|
||||
if (tp->pci_chip_rev_id == CHIPREV_ID_5705_A0) {
|
||||
@@ -7408,9 +7446,12 @@ static int tg3_halt_cpu(struct tg3 *tp,
|
||||
@@ -7403,9 +7441,12 @@ static int tg3_halt_cpu(struct tg3 *tp,
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
@@ -161,7 +161,7 @@
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -7472,6 +7513,11 @@ static int tg3_load_5701_a0_firmware_fix
|
||||
@@ -7467,6 +7508,11 @@ static int tg3_load_5701_a0_firmware_fix
|
||||
const __be32 *fw_data;
|
||||
int err, i;
|
||||
|
||||
@@ -173,7 +173,7 @@
|
||||
fw_data = (void *)tp->fw->data;
|
||||
|
||||
/* Firmware blob starts with version numbers, followed by
|
||||
@@ -7528,6 +7574,11 @@ static int tg3_load_tso_firmware(struct
|
||||
@@ -7523,6 +7569,11 @@ static int tg3_load_tso_firmware(struct
|
||||
unsigned long cpu_base, cpu_scratch_base, cpu_scratch_size;
|
||||
int err, i;
|
||||
|
||||
@@ -185,7 +185,7 @@
|
||||
if (tg3_flag(tp, HW_TSO_1) ||
|
||||
tg3_flag(tp, HW_TSO_2) ||
|
||||
tg3_flag(tp, HW_TSO_3))
|
||||
@@ -8825,6 +8876,11 @@ static void tg3_timer(unsigned long __op
|
||||
@@ -8819,6 +8870,11 @@ static void tg3_timer(unsigned long __op
|
||||
|
||||
spin_lock(&tp->lock);
|
||||
|
||||
@@ -197,7 +197,7 @@
|
||||
if (!tg3_flag(tp, TAGGED_STATUS)) {
|
||||
/* All of this garbage is because when using non-tagged
|
||||
* IRQ status the mailbox/status_block protocol the chip
|
||||
@@ -10448,6 +10504,11 @@ static int tg3_test_nvram(struct tg3 *tp
|
||||
@@ -10446,6 +10502,11 @@ static int tg3_test_nvram(struct tg3 *tp
|
||||
if (tg3_flag(tp, NO_NVRAM))
|
||||
return 0;
|
||||
|
||||
@@ -209,7 +209,7 @@
|
||||
if (tg3_nvram_read(tp, 0, &magic) != 0)
|
||||
return -EIO;
|
||||
|
||||
@@ -11442,7 +11503,7 @@ static int tg3_ioctl(struct net_device *
|
||||
@@ -11440,7 +11501,7 @@ static int tg3_ioctl(struct net_device *
|
||||
return -EAGAIN;
|
||||
|
||||
spin_lock_bh(&tp->lock);
|
||||
@@ -218,7 +218,7 @@
|
||||
spin_unlock_bh(&tp->lock);
|
||||
|
||||
data->val_out = mii_regval;
|
||||
@@ -11458,7 +11519,7 @@ static int tg3_ioctl(struct net_device *
|
||||
@@ -11456,7 +11517,7 @@ static int tg3_ioctl(struct net_device *
|
||||
return -EAGAIN;
|
||||
|
||||
spin_lock_bh(&tp->lock);
|
||||
@@ -227,7 +227,7 @@
|
||||
spin_unlock_bh(&tp->lock);
|
||||
|
||||
return err;
|
||||
@@ -12188,6 +12249,13 @@ static void __devinit tg3_get_5720_nvram
|
||||
@@ -12186,6 +12247,13 @@ static void __devinit tg3_get_5720_nvram
|
||||
/* Chips other than 5700/5701 use the NVRAM for fetching info. */
|
||||
static void __devinit tg3_nvram_init(struct tg3 *tp)
|
||||
{
|
||||
@@ -241,7 +241,7 @@
|
||||
tw32_f(GRC_EEPROM_ADDR,
|
||||
(EEPROM_ADDR_FSM_RESET |
|
||||
(EEPROM_DEFAULT_CLOCK_PERIOD <<
|
||||
@@ -12454,6 +12522,9 @@ static int tg3_nvram_write_block(struct
|
||||
@@ -12452,6 +12520,9 @@ static int tg3_nvram_write_block(struct
|
||||
{
|
||||
int ret;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user