kernel: fix some build warnings with kernel 2.6.36

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23226 3c298f89-4303-0410-b956-a3cf2f4a3e73

3 files changed, 18 insertions, 6 deletions

diff --git a/target/linux/generic/config-2.6.36 b/target/linux/generic/config-2.6.36
index 199d70b5db..60e0733a56 100644
--- a/target/linux/generic/config-2.6.36
+++ b/target/linux/generic/config-2.6.36
@@ -374,6 +374,7 @@ CONFIG_CONSTRUCTORS=y
 CONFIG_CRASHLOG=y
 # CONFIG_CRYPTO_DEV_MV_CESA is not set
 # CONFIG_CRYPTO_MANAGER_TESTS is not set
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
 # CONFIG_CRYPTO_PCRYPT is not set
 # CONFIG_CRC16 is not set
 CONFIG_CRC32=y
@@ -430,6 +431,7 @@ CONFIG_CRYPTO_MANAGER_NO_TESTS=y
 # CONFIG_CRYPTO_NULL is not set
 # CONFIG_CRYPTO_PCBC is not set
 CONFIG_CRYPTO_PCOMP=y
+CONFIG_CRYPTO_PCOMP2=y
 # CONFIG_CRYPTO_PRNG is not set
 # CONFIG_CRYPTO_RMD128 is not set
 # CONFIG_CRYPTO_RMD160 is not set
@@ -586,6 +588,7 @@ CONFIG_EXTRA_FIRMWARE=""
 CONFIG_EXTRA_TARGETS=""
 # CONFIG_EZX_PCAP is not set
 # CONFIG_FAIR_GROUP_SCHED is not set
+# CONFIG_FANOTIFY is not set
 # CONFIG_FAULT_INJECTION is not set
 CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
@@ -656,6 +659,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 CONFIG_FIB_RULES=y
 CONFIG_FILE_LOCKING=y
 # CONFIG_FIREWIRE is not set
+# CONFIG_FIREWIRE_NOSY is not set
 # CONFIG_FIRMWARE_IN_KERNEL is not set
 # CONFIG_FIXED_PHY is not set
 CONFIG_FLATMEM_MANUAL=y
@@ -1630,6 +1634,7 @@ CONFIG_NET_SCH_FIFO=y
 CONFIG_NET_WIRELESS_RTNETLINK=y
 CONFIG_NET_WIRELESS=y
 CONFIG_NETWORK_FILESYSTEMS=y
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETXEN_NIC is not set
 CONFIG_NET=y
@@ -3056,6 +3061,7 @@ CONFIG_XFRM=y
 CONFIG_ZISOFS=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_ZLIB_INFLATE=y
+# CONFIG_ZRAM is not set
 CONFIG_ZONE_DMA_FLAG=1
 CONFIG_ZONE_DMA=y
 CONFIG_DEFAULT_SECURITY_DAC=y
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 d7e3220d24..10900b4e18 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 57f071ba7b..28f1c68ba0 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;