upgrade orion to 2.6.26-rc7

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

7 files changed, 7 insertions, 6 deletions

diff --git a/target/linux/generic-2.6/config-2.6.26 b/target/linux/generic-2.6/config-2.6.26
index 5f3bc7640..4a335278b 100644
--- a/target/linux/generic-2.6/config-2.6.26
+++ b/target/linux/generic-2.6/config-2.6.26
@@ -1153,6 +1153,7 @@ CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_RTC_CLASS is not set
 CONFIG_RTC_DRV_CMOS=y
 # CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_FM3130 is not set
 # CONFIG_RTC_DRV_MAX6900 is not set
 # CONFIG_RTC_DRV_MAX6902 is not set
 # CONFIG_RTC_DRV_R9701 is not set
diff --git a/target/linux/generic-2.6/patches-2.6.26/100-netfilter_layer7_2.17.patch b/target/linux/generic-2.6/patches-2.6.26/100-netfilter_layer7_2.17.patch
index 451dfe9c1..6d7fbd585 100644
--- a/target/linux/generic-2.6/patches-2.6.26/100-netfilter_layer7_2.17.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/100-netfilter_layer7_2.17.patch
@@ -2027,7 +2027,7 @@
 +}
 --- a/net/netfilter/nf_conntrack_core.c
 +++ b/net/netfilter/nf_conntrack_core.c
-@@ -207,6 +207,14 @@
+@@ -205,6 +205,14 @@
  	 * too. */
  	nf_ct_remove_expectations(ct);
  
diff --git a/target/linux/generic-2.6/patches-2.6.26/150-netfilter_imq.patch b/target/linux/generic-2.6/patches-2.6.26/150-netfilter_imq.patch
index cd05e0f6e..830fb5d80 100644
--- a/target/linux/generic-2.6/patches-2.6.26/150-netfilter_imq.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/150-netfilter_imq.patch
@@ -687,7 +687,7 @@
  #include <linux/proc_fs.h>
  #include <linux/seq_file.h>
  #include <linux/stat.h>
-@@ -1545,7 +1548,11 @@
+@@ -1569,7 +1572,11 @@
  int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
  {
  	if (likely(!skb->next)) {
diff --git a/target/linux/generic-2.6/patches-2.6.26/202-mips-freestanding.patch b/target/linux/generic-2.6/patches-2.6.26/202-mips-freestanding.patch
index cd961e5a8..17ef6c629 100644
--- a/target/linux/generic-2.6/patches-2.6.26/202-mips-freestanding.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/202-mips-freestanding.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/Makefile
 +++ b/arch/mips/Makefile
-@@ -593,6 +593,9 @@
+@@ -597,6 +597,9 @@
  cflags-$(CONFIG_TOSHIBA_RBTX4938) += -Iinclude/asm-mips/mach-tx49xx
  load-$(CONFIG_TOSHIBA_RBTX4938) += 0xffffffff80100000
  
diff --git a/target/linux/generic-2.6/patches-2.6.26/410-gpio_buttons.patch b/target/linux/generic-2.6/patches-2.6.26/410-gpio_buttons.patch
index 29e616725..6ae2cd7df 100644
--- a/target/linux/generic-2.6/patches-2.6.26/410-gpio_buttons.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/410-gpio_buttons.patch
@@ -1,6 +1,6 @@
 --- a/drivers/input/misc/Kconfig
 +++ b/drivers/input/misc/Kconfig
-@@ -198,4 +198,20 @@
+@@ -197,4 +197,20 @@
  	  Say Y here if you want to support the built-in real time clock
  	  of the HP SDC controller.
  
diff --git a/target/linux/orion/Makefile b/target/linux/orion/Makefile
index 8b18cccb1..22584e006 100644
--- a/target/linux/orion/Makefile
+++ b/target/linux/orion/Makefile
@@ -11,7 +11,7 @@ BOARD:=orion
 BOARDNAME:=Marvell Orion
 FEATURES:=squashfs
 
-LINUX_VERSION:=2.6.26-rc6
+LINUX_VERSION:=2.6.26-rc7
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/orion/patches/060-mv643xx_git_backport.patch b/target/linux/orion/patches/060-mv643xx_git_backport.patch
index 0b039224d..76eaddd49 100644
--- a/target/linux/orion/patches/060-mv643xx_git_backport.patch
+++ b/target/linux/orion/patches/060-mv643xx_git_backport.patch
@@ -5327,7 +5327,7 @@
 +#endif
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -2689,12 +2689,10 @@
+@@ -2690,12 +2690,10 @@
  S:	Maintained
  
  MARVELL MV643XX ETHERNET DRIVER