diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2010-10-04 20:43:07 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2010-10-04 20:43:07 +0000 |
| commit | 7f473a276fb0eea0c31c6192080c66f03f6ff69d (patch) | |
| tree | 8592a16c2ef758627dfa3489735a0ef38a96ddd4 /target/linux/generic/patches-2.6.36 | |
| parent | 7cb70cb2b8f2b3e31d3e86576141abb161593fb6 (diff) | |
| download | mtk-20170518-7f473a276fb0eea0c31c6192080c66f03f6ff69d.zip mtk-20170518-7f473a276fb0eea0c31c6192080c66f03f6ff69d.tar.gz mtk-20170518-7f473a276fb0eea0c31c6192080c66f03f6ff69d.tar.bz2 | |
kernel: fix some build warnings with kernel 2.6.36
SVN-Revision: 23226
Diffstat (limited to 'target/linux/generic/patches-2.6.36')
| -rw-r--r-- | target/linux/generic/patches-2.6.36/209-mini_fo.patch | 6 | ||||
| -rw-r--r-- | target/linux/generic/patches-2.6.36/402-ledtrig_netdev.patch | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/target/linux/generic/patches-2.6.36/209-mini_fo.patch b/target/linux/generic/patches-2.6.36/209-mini_fo.patch index d7e3220..10900b4 100644 --- a/target/linux/generic/patches-2.6.36/209-mini_fo.patch +++ b/target/linux/generic/patches-2.6.36/209-mini_fo.patch @@ -7492,7 +7492,7 @@ + --- /dev/null +++ b/fs/mini_fo/super.c -@@ -0,0 +1,281 @@ +@@ -0,0 +1,285 @@ +/* + * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 2001-2003 Stony Brook University @@ -7665,7 +7665,11 @@ + struct dentry *hidden_d; + + hidden_d = dtohd(d); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36) ++ err = statfs_by_dentry(hidden_d, buf); ++#else + err = vfs_statfs(hidden_d, buf); ++#endif +#else + super_block_t *hidden_sb; + diff --git a/target/linux/generic/patches-2.6.36/402-ledtrig_netdev.patch b/target/linux/generic/patches-2.6.36/402-ledtrig_netdev.patch index 57f071b..28f1c68 100644 --- a/target/linux/generic/patches-2.6.36/402-ledtrig_netdev.patch +++ b/target/linux/generic/patches-2.6.36/402-ledtrig_netdev.patch @@ -1,6 +1,6 @@ --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig -@@ -375,4 +375,11 @@ config LEDS_TRIGGER_MORSE +@@ -384,4 +384,11 @@ config LEDS_TRIGGER_MORSE tristate "LED Morse Trigger" depends on LEDS_TRIGGERS @@ -14,17 +14,19 @@ endif # NEW_LEDS --- a/drivers/leds/Makefile +++ b/drivers/leds/Makefile -@@ -49,3 +49,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) += +@@ -50,3 +50,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) += obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledtrig-gpio.o obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o obj-$(CONFIG_LEDS_TRIGGER_MORSE) += ledtrig-morse.o +obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o - --- a/drivers/leds/ledtrig-netdev.c +++ b/drivers/leds/ledtrig-netdev.c -@@ -309,6 +309,7 @@ static void netdev_trig_timer(unsigned l +@@ -307,8 +307,9 @@ done: + static void netdev_trig_timer(unsigned long arg) + { struct led_netdev_data *trigger_data = (struct led_netdev_data *)arg; - const struct net_device_stats *dev_stats; +- const struct net_device_stats *dev_stats; ++ struct rtnl_link_stats64 *dev_stats; unsigned new_activity; + struct rtnl_link_stats64 temp; |