diff options
author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-05-14 09:18:32 +0000 |
---|---|---|
committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-05-14 09:18:32 +0000 |
commit | 298dcd23d163fc91a0e57cf5da720d78e4072937 (patch) | |
tree | 6fcc8c2ffb816d285e214b80c11eca0670e2ab21 /target/linux/lantiq | |
parent | 7417c040c77b993e0be73676e2edaef37b99082f (diff) |
kernel: update linux 3.3 to 3.3.6
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31709 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/lantiq')
3 files changed, 11 insertions, 11 deletions
diff --git a/target/linux/lantiq/patches-3.3/201-owrt-mtd_split.patch b/target/linux/lantiq/patches-3.3/201-owrt-mtd_split.patch index 62cfc4ec9..5883d2a63 100644 --- a/target/linux/lantiq/patches-3.3/201-owrt-mtd_split.patch +++ b/target/linux/lantiq/patches-3.3/201-owrt-mtd_split.patch @@ -13,7 +13,7 @@ ---help--- --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c -@@ -874,6 +874,169 @@ static int refresh_rootfs_split(struct m +@@ -867,6 +867,169 @@ static int refresh_rootfs_split(struct m } #endif /* CONFIG_MTD_ROOTFS_SPLIT */ @@ -183,7 +183,7 @@ /* * This function, given a master MTD object and a partition table, creates * and registers slave MTD objects which are bound to the master according to -@@ -890,7 +1053,7 @@ int add_mtd_partitions(struct mtd_info * +@@ -883,7 +1046,7 @@ int add_mtd_partitions(struct mtd_info * struct mtd_part *slave; uint64_t cur_offset = 0; int i; @@ -192,7 +192,7 @@ int ret; #endif -@@ -907,6 +1070,17 @@ int add_mtd_partitions(struct mtd_info * +@@ -900,6 +1063,17 @@ int add_mtd_partitions(struct mtd_info * add_mtd_device(&slave->mtd); diff --git a/target/linux/lantiq/patches-3.3/204-owrt-dm9000-polling.patch b/target/linux/lantiq/patches-3.3/204-owrt-dm9000-polling.patch index ff57422d5..7e898b810 100644 --- a/target/linux/lantiq/patches-3.3/204-owrt-dm9000-polling.patch +++ b/target/linux/lantiq/patches-3.3/204-owrt-dm9000-polling.patch @@ -17,7 +17,7 @@ spinlock_t lock; struct mii_if_info mii; -@@ -844,6 +847,8 @@ static void dm9000_timeout(struct net_de +@@ -845,6 +848,8 @@ static void dm9000_timeout(struct net_de netif_stop_queue(dev); dm9000_reset(db); dm9000_init_dm9000(dev); @@ -26,7 +26,7 @@ /* We can accept TX packets again */ dev->trans_start = jiffies; /* prevent tx timeout */ netif_wake_queue(dev); -@@ -915,6 +920,12 @@ dm9000_start_xmit(struct sk_buff *skb, s +@@ -916,6 +921,12 @@ dm9000_start_xmit(struct sk_buff *skb, s /* free this SKB */ dev_kfree_skb(skb); @@ -39,7 +39,7 @@ return NETDEV_TX_OK; } -@@ -1156,6 +1167,18 @@ static void dm9000_poll_controller(struc +@@ -1157,6 +1168,18 @@ static void dm9000_poll_controller(struc } #endif @@ -58,7 +58,7 @@ /* * Open the interface. * The interface is opened whenever "ifconfig" actives it. -@@ -1169,14 +1192,15 @@ dm9000_open(struct net_device *dev) +@@ -1170,14 +1193,15 @@ dm9000_open(struct net_device *dev) if (netif_msg_ifup(db)) dev_dbg(db->dev, "enabling %s\n", dev->name); @@ -80,7 +80,7 @@ /* GPIO0 on pre-activate PHY, Reg 1F is not set by reset */ iow(db, DM9000_GPR, 0); /* REG_1F bit0 activate phyxcer */ mdelay(1); /* delay needs by DM9000B */ -@@ -1185,8 +1209,14 @@ dm9000_open(struct net_device *dev) +@@ -1186,8 +1210,14 @@ dm9000_open(struct net_device *dev) dm9000_reset(db); dm9000_init_dm9000(dev); @@ -97,7 +97,7 @@ /* Init driver variable */ db->dbug_cnt = 0; -@@ -1194,6 +1224,9 @@ dm9000_open(struct net_device *dev) +@@ -1195,6 +1225,9 @@ dm9000_open(struct net_device *dev) mii_check_media(&db->mii, netif_msg_link(db), 1); netif_start_queue(dev); @@ -107,7 +107,7 @@ dm9000_schedule_poll(db); return 0; -@@ -1391,6 +1424,7 @@ dm9000_probe(struct platform_device *pde +@@ -1392,6 +1425,7 @@ dm9000_probe(struct platform_device *pde mutex_init(&db->addr_lock); INIT_DELAYED_WORK(&db->phy_poll, dm9000_poll_work); diff --git a/target/linux/lantiq/patches-3.3/205-owrt-gpio-export.patch b/target/linux/lantiq/patches-3.3/205-owrt-gpio-export.patch index 670b22449..df4928463 100644 --- a/target/linux/lantiq/patches-3.3/205-owrt-gpio-export.patch +++ b/target/linux/lantiq/patches-3.3/205-owrt-gpio-export.patch @@ -32,7 +32,7 @@ if (status == 0) { struct device *dev; -@@ -1347,11 +1346,11 @@ const char *gpiochip_is_requested(struct +@@ -1351,11 +1350,11 @@ const char *gpiochip_is_requested(struct return NULL; if (test_bit(FLAG_REQUESTED, &gpio_desc[gpio].flags) == 0) return NULL; |