[kernel] refresh generic 2.6.26 patches

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11336 3c298f89-4303-0410-b956-a3cf2f4a3e73
2024-12-28 11:26:26 +02:00 · 2008-06-02 19:49:28 +00:00 · 2008-06-02 19:49:28 +00:00 · e1ee35b052
commit e1ee35b052
parent 77ac43966f
28 changed files with 68 additions and 68 deletions
--- a/target/linux/generic-2.6/patches-2.6.26/001-squashfs.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/001-squashfs.patch
@ -1,6 +1,6 @@
 --- a/fs/Kconfig
 +++ b/fs/Kconfig
-@@ -1367,6 +1367,71 @@
+@@ -1395,6 +1395,71 @@
 
 	  If unsure, say N.
 
--- a/target/linux/generic-2.6/patches-2.6.26/004-extra_optimization.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/004-extra_optimization.patch
@ -1,6 +1,6 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -533,6 +533,9 @@
+@@ -537,6 +537,9 @@
 NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
 CHECKFLAGS     += $(NOSTDINC_FLAGS)
 
--- a/target/linux/generic-2.6/patches-2.6.26/007-samsung_flash.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/007-samsung_flash.patch
@ -8,7 +8,7 @@
 
 static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
 static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
-@@ -298,12 +299,19 @@
+@@ -324,12 +325,19 @@
 
 		if (extp->MajorVersion != '1' ||
 		    (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {
--- a/target/linux/generic-2.6/patches-2.6.26/009-revert_intel_flash_breakage.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/009-revert_intel_flash_breakage.patch
@ -1,6 +1,6 @@
 --- a/drivers/mtd/chips/cfi_cmdset_0001.c
 +++ b/drivers/mtd/chips/cfi_cmdset_0001.c
-@@ -1008,7 +1008,7 @@
+@@ -1010,7 +1010,7 @@
 
 static int __xipram xip_wait_for_operation(
 		struct map_info *map, struct flchip *chip,
@ -9,7 +9,7 @@
 {
 	struct cfi_private *cfi = map->fldrv_priv;
 	struct cfi_pri_intelext *cfip = cfi->cmdset_priv;
-@@ -1017,7 +1017,7 @@
+@@ -1019,7 +1019,7 @@
 	flstate_t oldstate, newstate;
 
        	start = xip_currtime();
@ -18,7 +18,7 @@
 	if (usec == 0)
 		usec = 500000;
 	done = 0;
-@@ -1127,8 +1127,8 @@
+@@ -1129,8 +1129,8 @@
 #define XIP_INVAL_CACHED_RANGE(map, from, size)  \
 	INVALIDATE_CACHED_RANGE(map, from, size)
 
@ -29,7 +29,7 @@
 
 #else
 
-@@ -1140,65 +1140,65 @@
+@@ -1142,65 +1142,65 @@
 static int inval_cache_and_wait_for_operation(
 		struct map_info *map, struct flchip *chip,
 		unsigned long cmd_adr, unsigned long inval_adr, int inval_len,
@ -130,7 +130,7 @@
 	/* Done and happy. */
  	chip->state = FL_STATUS;
 	return 0;
-@@ -1207,7 +1207,8 @@
+@@ -1209,7 +1209,8 @@
 #endif
 
 #define WAIT_TIMEOUT(map, chip, adr, udelay) \
@ -140,7 +140,7 @@
 
 
 static int do_point_onechip (struct map_info *map, struct flchip *chip, loff_t adr, size_t len)
-@@ -1438,7 +1439,7 @@
+@@ -1443,7 +1444,7 @@
 
 	ret = INVAL_CACHE_AND_WAIT(map, chip, adr,
 				   adr, map_bankwidth(map),
@ -149,7 +149,7 @@
 	if (ret) {
 		xip_enable(map, chip, adr);
 		printk(KERN_ERR "%s: word write error (status timeout)\n", map->name);
-@@ -1678,7 +1679,7 @@
+@@ -1683,7 +1684,7 @@
 
 	ret = INVAL_CACHE_AND_WAIT(map, chip, cmd_adr,
 				   initial_adr, initial_len,
@ -158,7 +158,7 @@
 	if (ret) {
 		map_write(map, CMD(0x70), cmd_adr);
 		chip->state = FL_STATUS;
-@@ -1813,7 +1814,7 @@
+@@ -1818,7 +1819,7 @@
 
 	ret = INVAL_CACHE_AND_WAIT(map, chip, adr,
 				   adr, len,
--- a/target/linux/generic-2.6/patches-2.6.26/065-rootfs_split.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/065-rootfs_split.patch
@ -903,7 +903,7 @@
 struct mtd_info {
 	u_char type;
 	u_int32_t flags;
-@@ -211,6 +212,9 @@
+@@ -213,6 +214,9 @@
 	struct module *owner;
 	int usecount;
 
--- 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
@ -1,6 +1,6 @@
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig
-@@ -735,6 +735,27 @@
+@@ -749,6 +749,27 @@
 
 	  To compile it as a module, choose M here.  If unsure, say N.
 
@ -30,7 +30,7 @@
 	depends on NETFILTER_XTABLES
 --- a/net/netfilter/Makefile
 +++ b/net/netfilter/Makefile
-@@ -77,6 +77,7 @@
+@@ -78,6 +78,7 @@
 obj-$(CONFIG_NETFILTER_XT_MATCH_REALM) += xt_realm.o
 obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
 obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o
@ -2027,7 +2027,7 @@
 +}
 --- a/net/netfilter/nf_conntrack_core.c
 +++ b/net/netfilter/nf_conntrack_core.c
-@@ -210,6 +210,14 @@
+@@ -207,6 +207,14 @@
 	 * too. */
 	nf_ct_remove_expectations(ct);
 
@ -2044,7 +2044,7 @@
 		BUG_ON(hlist_unhashed(&ct->tuplehash[IP_CT_DIR_ORIGINAL].hnode));
 --- a/net/netfilter/nf_conntrack_standalone.c
 +++ b/net/netfilter/nf_conntrack_standalone.c
-@@ -181,7 +181,12 @@
+@@ -174,7 +174,12 @@
 		return -ENOSPC;
 #endif
 
--- a/target/linux/generic-2.6/patches-2.6.26/110-ipp2p_0.8.1rc1.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/110-ipp2p_0.8.1rc1.patch
@ -908,7 +908,7 @@
 	depends on IP_NF_IPTABLES
 --- a/net/ipv4/netfilter/Makefile
 +++ b/net/ipv4/netfilter/Makefile
-@@ -47,6 +47,8 @@
+@@ -50,6 +50,8 @@
 obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
 obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
 
--- a/target/linux/generic-2.6/patches-2.6.26/130-netfilter_ipset.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/130-netfilter_ipset.patch
@ -7517,7 +7517,7 @@
 +module_exit(ipt_SET_fini);
 --- a/net/ipv4/netfilter/Kconfig
 +++ b/net/ipv4/netfilter/Kconfig
-@@ -385,5 +385,122 @@
+@@ -401,5 +401,122 @@
 	  Allows altering the ARP packet payload: source and destination
 	  hardware and network addresses.
 
@ -7642,7 +7642,7 @@
 
 --- a/net/ipv4/netfilter/Makefile
 +++ b/net/ipv4/netfilter/Makefile
-@@ -46,6 +46,7 @@
+@@ -49,6 +49,7 @@
 obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn.o
 obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
 obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
@ -7650,7 +7650,7 @@
 
 obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_ipp2p.o
 
-@@ -59,6 +60,18 @@
+@@ -62,6 +63,18 @@
 obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o
 obj-$(CONFIG_IP_NF_TARGET_TTL) += ipt_TTL.o
 obj-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG.o
--- a/target/linux/generic-2.6/patches-2.6.26/140-netfilter_time.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/140-netfilter_time.patch
@ -229,7 +229,7 @@
 	depends on IP_NF_IPTABLES
 --- a/net/ipv4/netfilter/Makefile
 +++ b/net/ipv4/netfilter/Makefile
-@@ -47,6 +47,7 @@
+@@ -50,6 +50,7 @@
 obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
 obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
 obj-$(CONFIG_IP_NF_MATCH_SET) += ipt_set.o
--- 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
@ -545,7 +545,7 @@
 	select CRC32
 --- a/drivers/net/Makefile
 +++ b/drivers/net/Makefile
-@@ -143,6 +143,7 @@
+@@ -142,6 +142,7 @@
 obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
 
 obj-$(CONFIG_DUMMY) += dummy.o
@ -589,7 +589,7 @@
 +#endif /* _IP6T_IMQ_H */
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
-@@ -296,6 +296,10 @@
+@@ -300,6 +300,10 @@
 	struct nf_conntrack	*nfct;
 	struct sk_buff		*nfct_reasm;
 #endif
@ -600,7 +600,7 @@
 #ifdef CONFIG_BRIDGE_NETFILTER
 	struct nf_bridge_info	*nf_bridge;
 #endif
-@@ -1736,6 +1740,10 @@
+@@ -1633,6 +1637,10 @@
 	dst->nfct_reasm = src->nfct_reasm;
 	nf_conntrack_get_reasm(src->nfct_reasm);
 #endif
@ -623,7 +623,7 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/stat.h>
-@@ -1537,7 +1540,11 @@
+@@ -1545,7 +1548,11 @@
 int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
 	if (likely(!skb->next)) {
@ -730,7 +730,7 @@
 	depends on IP_NF_FILTER
 --- a/net/ipv4/netfilter/Makefile
 +++ b/net/ipv4/netfilter/Makefile
-@@ -55,6 +55,7 @@
+@@ -58,6 +58,7 @@
 obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += ipt_CLUSTERIP.o
 obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o
 obj-$(CONFIG_IP_NF_TARGET_LOG) += ipt_LOG.o
--- a/target/linux/generic-2.6/patches-2.6.26/170-netfilter_chaostables_0.8.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/170-netfilter_chaostables_0.8.patch
@ -95,7 +95,7 @@
 +#define xt_request_find_match xt_request_find_match_lo
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig
-@@ -276,6 +276,14 @@
+@@ -288,6 +288,14 @@
 
 # alphabetically ordered list of targets
 
@ -110,7 +110,7 @@
 config NETFILTER_XT_TARGET_CLASSIFY
 	tristate '"CLASSIFY" target support'
 	depends on NETFILTER_XTABLES
-@@ -305,6 +313,14 @@
+@@ -317,6 +325,14 @@
 	  <file:Documentation/kbuild/modules.txt>.  The module will be called
 	  ipt_CONNMARK.ko.  If unsure, say `N'.
 
@ -125,7 +125,7 @@
 config NETFILTER_XT_TARGET_DSCP
 	tristate '"DSCP" and "TOS" target support'
 	depends on NETFILTER_XTABLES
-@@ -640,6 +656,14 @@
+@@ -653,6 +669,14 @@
 
 	  To compile it as a module, choose M here.  If unsure, say N.
 
@ -142,7 +142,7 @@
 	depends on NETFILTER_XTABLES
 --- a/net/netfilter/Makefile
 +++ b/net/netfilter/Makefile
-@@ -50,6 +50,8 @@
+@@ -51,6 +51,8 @@
 obj-$(CONFIG_NETFILTER_XT_TARGET_TCPMSS) += xt_TCPMSS.o
 obj-$(CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP) += xt_TCPOPTSTRIP.o
 obj-$(CONFIG_NETFILTER_XT_TARGET_TRACE) += xt_TRACE.o
@ -151,7 +151,7 @@
 
 # matches
 obj-$(CONFIG_NETFILTER_XT_MATCH_COMMENT) += xt_comment.o
-@@ -83,3 +85,4 @@
+@@ -84,3 +86,4 @@
 obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o
 obj-$(CONFIG_NETFILTER_XT_MATCH_TIME) += xt_time.o
 obj-$(CONFIG_NETFILTER_XT_MATCH_U32) += xt_u32.o
@ -833,7 +833,7 @@
 +MODULE_ALIAS("ipt_portscan");
 --- a/drivers/char/random.c
 +++ b/drivers/char/random.c
-@@ -1563,6 +1563,8 @@
+@@ -1553,6 +1553,8 @@
 	return seq;
 }
 
--- a/target/linux/generic-2.6/patches-2.6.26/171-netfilter_tarpit.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/171-netfilter_tarpit.patch
@ -1,6 +1,6 @@
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig
-@@ -437,6 +437,23 @@
+@@ -449,6 +449,23 @@
 
 	  To compile it as a module, choose M here.  If unsure, say N.
 
@ -26,7 +26,7 @@
 	depends on NETFILTER_XTABLES && (IPV6 || IPV6=n)
 --- a/net/netfilter/Makefile
 +++ b/net/netfilter/Makefile
-@@ -47,6 +47,7 @@
+@@ -48,6 +48,7 @@
 obj-$(CONFIG_NETFILTER_XT_TARGET_NOTRACK) += xt_NOTRACK.o
 obj-$(CONFIG_NETFILTER_XT_TARGET_RATEEST) += xt_RATEEST.o
 obj-$(CONFIG_NETFILTER_XT_TARGET_SECMARK) += xt_SECMARK.o
--- a/target/linux/generic-2.6/patches-2.6.26/180-netfilter_depends.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/180-netfilter_depends.patch
@ -1,6 +1,6 @@
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig
-@@ -145,7 +145,7 @@
+@@ -157,7 +157,7 @@
 
 config NF_CONNTRACK_H323
 	tristate "H.323 protocol support"
@ -9,7 +9,7 @@
 	depends on NETFILTER_ADVANCED
 	help
 	  H.323 is a VoIP signalling protocol from ITU-T. As one of the most
-@@ -456,7 +456,7 @@
+@@ -468,7 +468,7 @@
 
 config NETFILTER_XT_TARGET_TCPMSS
 	tristate '"TCPMSS" target support'
--- a/target/linux/generic-2.6/patches-2.6.26/190-netfilter_rtsp.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/190-netfilter_rtsp.patch
@ -304,7 +304,7 @@
 obj-$(CONFIG_NF_NAT_SNMP_BASIC) += nf_nat_snmp_basic.o
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig
-@@ -258,6 +258,16 @@
+@@ -270,6 +270,16 @@
 
 	  To compile it as a module, choose M here.  If unsure, say N.
 
@ -323,7 +323,7 @@
 	depends on NF_CONNTRACK
 --- a/net/netfilter/Makefile
 +++ b/net/netfilter/Makefile
-@@ -32,6 +32,7 @@
+@@ -33,6 +33,7 @@
 obj-$(CONFIG_NF_CONNTRACK_SANE) += nf_conntrack_sane.o
 obj-$(CONFIG_NF_CONNTRACK_SIP) += nf_conntrack_sip.o
 obj-$(CONFIG_NF_CONNTRACK_TFTP) += nf_conntrack_tftp.o
@ -333,7 +333,7 @@
 obj-$(CONFIG_NETFILTER_XTABLES) += x_tables.o xt_tcpudp.o
 --- a/net/ipv4/netfilter/Kconfig
 +++ b/net/ipv4/netfilter/Kconfig
-@@ -277,6 +277,11 @@
+@@ -304,6 +304,11 @@
 	depends on IP_NF_IPTABLES && NF_CONNTRACK && NF_NAT
 	default NF_NAT && NF_CONNTRACK_IRC
 
--- a/target/linux/generic-2.6/patches-2.6.26/204-jffs2_eofdetect.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/204-jffs2_eofdetect.patch
@ -1,6 +1,6 @@
 --- a/fs/jffs2/build.c
 +++ b/fs/jffs2/build.c
-@@ -105,6 +105,17 @@
+@@ -111,6 +111,17 @@
 	dbg_fsbuild("scanned flash completely\n");
 	jffs2_dbg_dump_block_lists_nolock(c);
 
@ -20,7 +20,7 @@
 	/* Now scan the directory tree, increasing nlink according to every dirent found. */
 --- a/fs/jffs2/scan.c
 +++ b/fs/jffs2/scan.c
-@@ -142,9 +142,12 @@
+@@ -143,9 +143,12 @@
 
 		/* reset summary info for next eraseblock scan */
 		jffs2_sum_reset_collected(s);
@ -36,7 +36,7 @@
 
 		if (ret < 0)
 			goto out;
-@@ -545,6 +548,17 @@
+@@ -546,6 +549,17 @@
 			return err;
 	}
 
--- a/target/linux/generic-2.6/patches-2.6.26/209-mini_fo.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/209-mini_fo.patch
@ -1,6 +1,6 @@
 --- a/fs/Kconfig
 +++ b/fs/Kconfig
-@@ -1449,6 +1449,9 @@
+@@ -1477,6 +1477,9 @@
 	  To compile this as a module, choose M here: the module will be
 	  called freevxfs.  If unsure, say N.
 
--- a/target/linux/generic-2.6/patches-2.6.26/213-kobject_uevent.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/213-kobject_uevent.patch
@ -1,6 +1,6 @@
 --- a/lib/kobject_uevent.c
 +++ b/lib/kobject_uevent.c
-@@ -27,7 +27,8 @@
+@@ -29,7 +29,8 @@
 char uevent_helper[UEVENT_HELPER_PATH_LEN] = CONFIG_UEVENT_HELPER_PATH;
 static DEFINE_SPINLOCK(sequence_lock);
 #if defined(CONFIG_NET)
@ -10,7 +10,7 @@
 #endif
 
 /* the strings here must match the enum in include/linux/kobject.h */
-@@ -40,6 +41,18 @@
+@@ -42,6 +43,18 @@
 	[KOBJ_OFFLINE] =	"offline",
 };
 
@ -29,7 +29,7 @@
 /**
  * kobject_action_type - translate action string to numeric type
  *
-@@ -192,9 +205,7 @@
+@@ -194,9 +207,7 @@
 		kobj->state_remove_uevent_sent = 1;
 
 	/* we will send an event, so request a new sequence number */
--- a/target/linux/generic-2.6/patches-2.6.26/400-ledtrig_morse.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/400-ledtrig_morse.patch
@ -1,7 +1,7 @@
 --- a/drivers/leds/Kconfig
 +++ b/drivers/leds/Kconfig
-@@ -181,4 +181,8 @@
- 	  load average.
+@@ -190,4 +190,8 @@
+ 	  This allows LEDs to be initialised in the ON state.
 	  If unsure, say Y.
 
 +config LEDS_TRIGGER_MORSE
@ -11,7 +11,7 @@
 endif # NEW_LEDS
 --- a/drivers/leds/Makefile
 +++ b/drivers/leds/Makefile
-@@ -26,3 +26,4 @@
+@@ -27,3 +27,4 @@
 obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK)	+= ledtrig-ide-disk.o
 obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)	+= ledtrig-heartbeat.o
 obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)	+= ledtrig-default-on.o
--- a/target/linux/generic-2.6/patches-2.6.26/401-led_alix.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/401-led_alix.patch
@ -1,6 +1,6 @@
 --- a/drivers/leds/Kconfig
 +++ b/drivers/leds/Kconfig
-@@ -79,6 +79,12 @@
+@@ -77,6 +77,12 @@
 	help
 	  This option enables support for the PCEngines WRAP programmable LEDs.
 
@ -15,7 +15,7 @@
 	depends on LEDS_CLASS && ARCH_H1940
 --- a/drivers/leds/Makefile
 +++ b/drivers/leds/Makefile
-@@ -14,6 +14,7 @@
+@@ -13,6 +13,7 @@
 obj-$(CONFIG_LEDS_AMS_DELTA)		+= leds-ams-delta.o
 obj-$(CONFIG_LEDS_NET48XX)		+= leds-net48xx.o
 obj-$(CONFIG_LEDS_WRAP)			+= leds-wrap.o
--- 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
-@@ -197,4 +197,20 @@
+@@ -198,4 +198,20 @@
 	  Say Y here if you want to support the built-in real time clock
 	  of the HP SDC controller.
 
--- a/target/linux/generic-2.6/patches-2.6.26/420-gpiodev.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/420-gpiodev.patch
@ -1,6 +1,6 @@
 --- a/drivers/char/Kconfig
 +++ b/drivers/char/Kconfig
-@@ -955,6 +955,13 @@
+@@ -1002,6 +1002,13 @@
 
 	  If compiled as a module, it will be called cs5535_gpio.
 
@ -16,7 +16,7 @@
 	depends on CPU_VR41XX
 --- a/drivers/char/Makefile
 +++ b/drivers/char/Makefile
-@@ -94,6 +94,7 @@
+@@ -95,6 +95,7 @@
 obj-$(CONFIG_PC8736x_GPIO)	+= pc8736x_gpio.o
 obj-$(CONFIG_NSC_GPIO)		+= nsc_gpio.o
 obj-$(CONFIG_CS5535_GPIO)	+= cs5535_gpio.o
--- a/target/linux/generic-2.6/patches-2.6.26/600-phy_extension.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/600-phy_extension.patch
@ -53,7 +53,7 @@
  * @phydev: the phy_device struct
 --- a/include/linux/phy.h
 +++ b/include/linux/phy.h
-@@ -399,6 +399,7 @@
+@@ -434,6 +434,7 @@
 void phy_stop_machine(struct phy_device *phydev);
 int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
 int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd);
--- a/target/linux/generic-2.6/patches-2.6.26/610-phy_detect.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/610-phy_detect.patch
@ -1,6 +1,6 @@
 --- a/drivers/net/phy/mdio_bus.c
 +++ b/drivers/net/phy/mdio_bus.c
-@@ -132,6 +132,9 @@
+@@ -135,6 +135,9 @@
 	struct phy_device *phydev = to_phy_device(dev);
 	struct phy_driver *phydrv = to_phy_driver(drv);
 
@ -12,7 +12,7 @@
 }
 --- a/include/linux/phy.h
 +++ b/include/linux/phy.h
-@@ -325,6 +325,11 @@
+@@ -339,6 +339,11 @@
 	u32 features;
 	u32 flags;
 
--- a/target/linux/generic-2.6/patches-2.6.26/630-phy_packets.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/630-phy_packets.patch
@ -1,8 +1,8 @@
 --- a/drivers/net/phy/phy_device.c
 +++ b/drivers/net/phy/phy_device.c
-@@ -53,6 +53,18 @@
- 	phy_device_free(to_phy_device(dev));
+@@ -143,6 +143,18 @@
 }
+ EXPORT_SYMBOL(phy_scan_fixups);
 
 +static int generic_receive_skb(struct sk_buff *skb)
 +{
@ -19,7 +19,7 @@
 struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id)
 {
 	struct phy_device *dev;
-@@ -78,6 +90,8 @@
+@@ -168,6 +180,8 @@
 	dev->bus = bus;
 
 	dev->state = PHY_DOWN;
@ -30,7 +30,7 @@
 
 --- a/include/linux/phy.h
 +++ b/include/linux/phy.h
-@@ -295,6 +295,17 @@
+@@ -309,6 +309,17 @@
 	void (*adjust_link)(struct net_device *dev);
 
 	void (*adjust_state)(struct net_device *dev);
@ -50,7 +50,7 @@
 
 --- a/include/linux/netdevice.h
 +++ b/include/linux/netdevice.h
-@@ -595,6 +595,7 @@
+@@ -609,6 +609,7 @@
 	void			*ax25_ptr;	/* AX.25 specific data */
 	struct wireless_dev	*ieee80211_ptr;	/* IEEE 802.11 specific data,
 						   assign before registering */
--- a/target/linux/generic-2.6/patches-2.6.26/801-usb_serial_endpoint_size.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/801-usb_serial_endpoint_size.patch
@ -8,7 +8,7 @@
 static int debug;
 static struct usb_serial *serial_table[SERIAL_TTY_MINORS];	/* initially all NULL */
 static DEFINE_MUTEX(table_lock);
-@@ -904,7 +905,7 @@
+@@ -812,7 +813,7 @@
 			dev_err(&interface->dev, "No free urbs available\n");
 			goto probe_error;
 		}
@ -17,7 +17,7 @@
 		port->bulk_in_size = buffer_size;
 		port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
 		port->bulk_in_buffer = kmalloc (buffer_size, GFP_KERNEL);
-@@ -1316,3 +1317,5 @@
+@@ -1226,3 +1227,5 @@
 
 module_param(debug, bool, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(debug, "Debug enabled or not");
--- a/target/linux/generic-2.6/patches-2.6.26/840-unable_to_open_console.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/840-unable_to_open_console.patch
@ -1,6 +1,6 @@
 --- a/init/main.c
 +++ b/init/main.c
-@@ -775,7 +775,7 @@
+@@ -803,7 +803,7 @@
 	numa_default_policy();
 
 	if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
--- a/target/linux/generic-2.6/patches-2.6.26/902-darwin_scripts_include.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/902-darwin_scripts_include.patch
@ -24,7 +24,7 @@
 static int is_typedef;
 --- a/scripts/kallsyms.c
 +++ b/scripts/kallsyms.c
-@@ -28,6 +28,35 @@
+@@ -22,6 +22,35 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
--- a/target/linux/generic-2.6/patches-2.6.26/950-revert_xt_sctp_simplify.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/950-revert_xt_sctp_simplify.patch
@ -1,5 +1,5 @@
--- linux-2.6.26-rc4/include/linux/netfilter/xt_sctp.h	2008-05-26 20:08:11.000000000 +0200
-+++ linux-2.6.26-rc4-owrt/include/linux/netfilter/xt_sctp.h	2008-06-02 13:30:15.000000000 +0200
+--- a/include/linux/netfilter/xt_sctp.h
+++ b/include/linux/netfilter/xt_sctp.h
@@ -37,54 +37,68 @@
 
 #define SCTP_CHUNKMAP_SET(chunkmap, type) 		\