aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.27
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-10-15 19:30:21 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-10-15 19:30:21 +0000
commitab47d507d2ff2b0846433bc3c77de03c995258f6 (patch)
treeeaa83c336bf1e8a4942376277bb17dab04a0630e /target/linux/generic-2.6/patches-2.6.27
parent2154d8cde2088958a3c5f221bac76dfb8c9da600 (diff)
downloadupstream-ab47d507d2ff2b0846433bc3c77de03c995258f6.tar.gz
upstream-ab47d507d2ff2b0846433bc3c77de03c995258f6.tar.bz2
upstream-ab47d507d2ff2b0846433bc3c77de03c995258f6.zip
[kernel] refresh patches against 2.6.27 final
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12987 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.27')
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/001-squashfs.patch12
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/002-lzma_decompress.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/003-squashfs_lzma.patch10
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/004-extra_optimization.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/005-squashfs_fix.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/006-gcc4_inline_fix.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/007-samsung_flash.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/060-block2mtd_init.patch14
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/065-rootfs_split.patch46
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/070-redboot_space.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/071-redboot_boardconfig.patch8
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/080-mtd_plat_nand_chip_fixup.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/100-netfilter_layer7_2.17.patch10
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/101-netfilter_layer7_pktmatch.patch10
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/110-ipp2p_0.8.1rc1.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/130-netfilter_ipset.patch6
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/140-netfilter_time.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/150-netfilter_imq.patch18
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/170-netfilter_chaostables_0.8.patch12
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/171-netfilter_tarpit.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/180-netfilter_depends.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/190-netfilter_rtsp.patch8
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/200-sched_esfq.patch6
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/202-mips-freestanding.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/204-jffs2_eofdetect.patch22
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/208-rtl8110sb_fix.patch8
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/209-mini_fo.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/210-mini_fo_2.6.25_fixes.patch16
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/211-mini_fo_2.6.25_dentry_open_war.patch8
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/212-mini_fo_2.6.26_fixes.patch8
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/213-mini_fo_2.6.27_fixes.patch8
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/219-kobject_uevent.patch6
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/220-sound_kconfig.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/400-ledtrig_morse.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/401-led_alix.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/402-ledtrig_netdev.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/410-gpio_buttons.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/420-gpiodev.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/510-yaffs_support.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/512-yaffs_2.6.25_fix.patch10
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/513-yaffs_2.6.26_fix.patch14
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/600-phy_extension.patch8
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/610-phy_detect.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/620-phy_adm6996.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/630-phy_packets.patch8
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/640-mvswitch.patch6
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/801-usb_serial_endpoint_size.patch6
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/840-unable_to_open_console.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/900-headers_type_and_time.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/902-darwin_scripts_include.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/903-hostap_txpower.patch14
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/903-stddef_include.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/921-gpio_spi_driver.patch6
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/922-gpiommc.patch6
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/923-gpiommc-configfs-locking.patch12
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/950-revert_xt_sctp_simplify.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/951-revert_gcc4_4_fixes.patch8
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/952-revert_xt_string_case_insensitive_match.patch12
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/970-ocf_20080704.patch10
59 files changed, 221 insertions, 221 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.27/001-squashfs.patch b/target/linux/generic-2.6/patches-2.6.27/001-squashfs.patch
index 97ba7635ca..b8176914c1 100644
--- a/target/linux/generic-2.6/patches-2.6.27/001-squashfs.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/001-squashfs.patch
@@ -1,6 +1,6 @@
--- a/fs/Kconfig
+++ b/fs/Kconfig
-@@ -1348,6 +1348,71 @@
+@@ -1348,6 +1348,71 @@ config CRAMFS
If unsure, say N.
@@ -74,7 +74,7 @@
depends on BLOCK
--- a/fs/Makefile
+++ b/fs/Makefile
-@@ -74,6 +74,7 @@
+@@ -74,6 +74,7 @@ obj-$(CONFIG_JBD) += jbd/
obj-$(CONFIG_JBD2) += jbd2/
obj-$(CONFIG_EXT2_FS) += ext2/
obj-$(CONFIG_CRAMFS) += cramfs/
@@ -4128,7 +4128,7 @@
#include <linux/initrd.h>
#include <linux/string.h>
-@@ -37,6 +38,7 @@
+@@ -37,6 +38,7 @@ static int __init crd_load(int in_fd, in
* numbers could not be found.
*
* We currently check for the following magic numbers:
@@ -4136,7 +4136,7 @@
* minix
* ext2
* romfs
-@@ -51,6 +53,7 @@
+@@ -51,6 +53,7 @@ identify_ramdisk_image(int fd, int start
struct ext2_super_block *ext2sb;
struct romfs_super_block *romfsb;
struct cramfs_super *cramfsb;
@@ -4144,7 +4144,7 @@
int nblocks = -1;
unsigned char *buf;
-@@ -62,6 +65,7 @@
+@@ -62,6 +65,7 @@ identify_ramdisk_image(int fd, int start
ext2sb = (struct ext2_super_block *) buf;
romfsb = (struct romfs_super_block *) buf;
cramfsb = (struct cramfs_super *) buf;
@@ -4152,7 +4152,7 @@
memset(buf, 0xe5, size);
/*
-@@ -99,6 +103,15 @@
+@@ -99,6 +103,15 @@ identify_ramdisk_image(int fd, int start
goto done;
}
diff --git a/target/linux/generic-2.6/patches-2.6.27/002-lzma_decompress.patch b/target/linux/generic-2.6/patches-2.6.27/002-lzma_decompress.patch
index 5f23f66e16..c643ebe389 100644
--- a/target/linux/generic-2.6/patches-2.6.27/002-lzma_decompress.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/002-lzma_decompress.patch
@@ -769,7 +769,7 @@
+}
--- a/lib/Makefile
+++ b/lib/Makefile
-@@ -19,7 +19,7 @@
+@@ -19,7 +19,7 @@ lib-$(CONFIG_SMP) += cpumask.o
lib-y += kobject.o kref.o klist.o
obj-y += bcd.o div64.o sort.o parser.o halfmd4.o debug_locks.o random32.o \
diff --git a/target/linux/generic-2.6/patches-2.6.27/003-squashfs_lzma.patch b/target/linux/generic-2.6/patches-2.6.27/003-squashfs_lzma.patch
index 16cc873199..9050e370ca 100644
--- a/target/linux/generic-2.6/patches-2.6.27/003-squashfs_lzma.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/003-squashfs_lzma.patch
@@ -38,7 +38,7 @@
static void squashfs_put_super(struct super_block *);
static int squashfs_statfs(struct dentry *, struct kstatfs *);
static int squashfs_symlink_readpage(struct file *file, struct page *page);
-@@ -64,7 +81,11 @@
+@@ -64,7 +81,11 @@ static int squashfs_get_sb(struct file_s
const char *, void *, struct vfsmount *);
@@ -50,7 +50,7 @@
static struct file_system_type squashfs_fs_type = {
.owner = THIS_MODULE,
-@@ -249,6 +270,15 @@
+@@ -249,6 +270,15 @@ SQSH_EXTERN unsigned int squashfs_read_d
if (compressed) {
int zlib_err;
@@ -66,7 +66,7 @@
stream.next_in = c_buffer;
stream.avail_in = c_byte;
stream.next_out = buffer;
-@@ -263,7 +293,7 @@
+@@ -263,7 +293,7 @@ SQSH_EXTERN unsigned int squashfs_read_d
bytes = 0;
} else
bytes = stream.total_out;
@@ -75,7 +75,7 @@
up(&msblk->read_data_mutex);
}
-@@ -2045,15 +2075,19 @@
+@@ -2045,15 +2075,19 @@ static int __init init_squashfs_fs(void)
printk(KERN_INFO "squashfs: version 3.0 (2006/03/15) "
"Phillip Lougher\n");
@@ -95,7 +95,7 @@
destroy_inodecache();
}
-@@ -2064,7 +2098,9 @@
+@@ -2064,7 +2098,9 @@ out:
static void __exit exit_squashfs_fs(void)
{
diff --git a/target/linux/generic-2.6/patches-2.6.27/004-extra_optimization.patch b/target/linux/generic-2.6/patches-2.6.27/004-extra_optimization.patch
index f9d43bce3a..d6866899c3 100644
--- a/target/linux/generic-2.6/patches-2.6.27/004-extra_optimization.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/004-extra_optimization.patch
@@ -1,6 +1,6 @@
--- a/Makefile
+++ b/Makefile
-@@ -549,6 +549,9 @@
+@@ -549,6 +549,9 @@ endif
NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
CHECKFLAGS += $(NOSTDINC_FLAGS)
diff --git a/target/linux/generic-2.6/patches-2.6.27/005-squashfs_fix.patch b/target/linux/generic-2.6/patches-2.6.27/005-squashfs_fix.patch
index d4c2d8051d..51474864e9 100644
--- a/target/linux/generic-2.6/patches-2.6.27/005-squashfs_fix.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/005-squashfs_fix.patch
@@ -18,7 +18,7 @@
#include "squashfs.h"
-@@ -2125,7 +2126,7 @@
+@@ -2125,7 +2126,7 @@ static void squashfs_destroy_inode(struc
}
diff --git a/target/linux/generic-2.6/patches-2.6.27/006-gcc4_inline_fix.patch b/target/linux/generic-2.6/patches-2.6.27/006-gcc4_inline_fix.patch
index dbb7e7c87e..cd62e9c250 100644
--- a/target/linux/generic-2.6/patches-2.6.27/006-gcc4_inline_fix.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/006-gcc4_inline_fix.patch
@@ -1,6 +1,6 @@
--- a/include/asm-mips/system.h
+++ b/include/asm-mips/system.h
-@@ -185,7 +185,7 @@
+@@ -185,7 +185,7 @@ extern __u64 __xchg_u64_unsupported_on_3
if something tries to do an invalid xchg(). */
extern void __xchg_called_with_bad_pointer(void);
diff --git a/target/linux/generic-2.6/patches-2.6.27/007-samsung_flash.patch b/target/linux/generic-2.6/patches-2.6.27/007-samsung_flash.patch
index 9cabf0e2da..1ca45d8548 100644
--- a/target/linux/generic-2.6/patches-2.6.27/007-samsung_flash.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/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 *);
-@@ -321,12 +322,19 @@
+@@ -321,12 +322,19 @@ struct mtd_info *cfi_cmdset_0002(struct
if (extp->MajorVersion != '1' ||
(extp->MinorVersion < '0' || extp->MinorVersion > '4')) {
diff --git a/target/linux/generic-2.6/patches-2.6.27/060-block2mtd_init.patch b/target/linux/generic-2.6/patches-2.6.27/060-block2mtd_init.patch
index 4483e7788c..50df4aae0f 100644
--- a/target/linux/generic-2.6/patches-2.6.27/060-block2mtd_init.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/060-block2mtd_init.patch
@@ -8,7 +8,7 @@
#include <linux/buffer_head.h>
#include <linux/mutex.h>
#include <linux/mount.h>
-@@ -232,10 +233,11 @@
+@@ -232,10 +233,11 @@ static void block2mtd_free_device(struct
/* FIXME: ensure that mtd->size % erase_size == 0 */
@@ -21,7 +21,7 @@
char *name;
if (!devname)
-@@ -273,17 +275,17 @@
+@@ -273,17 +275,17 @@ static struct block2mtd_dev *add_device(
mutex_init(&dev->write_mutex);
@@ -45,7 +45,7 @@
dev->mtd.erasesize = erase_size;
dev->mtd.writesize = 1;
dev->mtd.type = MTD_RAM;
-@@ -296,14 +298,17 @@
+@@ -296,14 +298,17 @@ static struct block2mtd_dev *add_device(
dev->mtd.priv = dev;
dev->mtd.owner = THIS_MODULE;
@@ -66,7 +66,7 @@
return dev;
devinit_err:
-@@ -376,9 +381,9 @@
+@@ -376,9 +381,9 @@ static char block2mtd_paramline[80 + 12]
static int block2mtd_setup2(const char *val)
{
@@ -78,7 +78,7 @@
char *name;
size_t erase_size = PAGE_SIZE;
int i, ret;
-@@ -389,7 +394,7 @@
+@@ -389,7 +394,7 @@ static int block2mtd_setup2(const char *
strcpy(str, val);
kill_final_newline(str);
@@ -87,7 +87,7 @@
token[i] = strsep(&str, ",");
if (str)
-@@ -408,8 +413,10 @@
+@@ -408,8 +413,10 @@ static int block2mtd_setup2(const char *
parse_err("illegal erase size");
}
}
@@ -99,7 +99,7 @@
return 0;
}
-@@ -443,7 +450,7 @@
+@@ -443,7 +450,7 @@ static int block2mtd_setup(const char *v
module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
diff --git a/target/linux/generic-2.6/patches-2.6.27/065-rootfs_split.patch b/target/linux/generic-2.6/patches-2.6.27/065-rootfs_split.patch
index 039a679a0a..41cca49cc3 100644
--- a/target/linux/generic-2.6/patches-2.6.27/065-rootfs_split.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/065-rootfs_split.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
-@@ -45,6 +45,16 @@
+@@ -45,6 +45,16 @@ config MTD_PARTITIONS
devices. Partitioning on NFTL 'devices' is a different - that's the
'normal' form of partitioning used on a block device.
@@ -28,7 +28,7 @@
/* Our partition linked list */
static LIST_HEAD(mtd_partitions);
-@@ -37,7 +39,7 @@
+@@ -37,7 +39,7 @@ struct mtd_part {
* the pointer to that structure with this macro.
*/
#define PART(x) ((struct mtd_part *)(x))
@@ -37,7 +37,7 @@
/*
* MTD methods which simply translate the effective address and pass through
-@@ -489,6 +491,148 @@
+@@ -489,6 +491,148 @@ out_register:
return slave;
}
@@ -186,7 +186,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
-@@ -502,14 +646,29 @@
+@@ -502,14 +646,29 @@ int add_mtd_partitions(struct mtd_info *
{
struct mtd_part *slave;
u_int32_t cur_offset = 0;
@@ -219,7 +219,7 @@
cur_offset = slave->offset + slave->mtd.size;
}
-@@ -517,6 +676,32 @@
+@@ -517,6 +676,32 @@ int add_mtd_partitions(struct mtd_info *
}
EXPORT_SYMBOL(add_mtd_partitions);
@@ -254,7 +254,7 @@
--- a/drivers/mtd/devices/block2mtd.c
+++ b/drivers/mtd/devices/block2mtd.c
-@@ -29,6 +29,8 @@
+@@ -29,6 +29,8 @@ struct block2mtd_dev {
struct block_device *blkdev;
struct mtd_info mtd;
struct mutex write_mutex;
@@ -263,7 +263,7 @@
};
-@@ -81,6 +83,12 @@
+@@ -81,6 +83,12 @@ static int block2mtd_erase(struct mtd_in
size_t len = instr->len;
int err;
@@ -276,7 +276,7 @@
instr->state = MTD_ERASING;
mutex_lock(&dev->write_mutex);
err = _block2mtd_erase(dev, from, len);
-@@ -93,6 +101,10 @@
+@@ -93,6 +101,10 @@ static int block2mtd_erase(struct mtd_in
instr->state = MTD_ERASE_DONE;
mtd_erase_callback(instr);
@@ -287,7 +287,7 @@
return err;
}
-@@ -104,10 +116,14 @@
+@@ -104,10 +116,14 @@ static int block2mtd_read(struct mtd_inf
struct page *page;
int index = from >> PAGE_SHIFT;
int offset = from & (PAGE_SIZE-1);
@@ -305,7 +305,7 @@
if (from + len > mtd->size)
len = mtd->size - from;
-@@ -122,10 +138,14 @@
+@@ -122,10 +138,14 @@ static int block2mtd_read(struct mtd_inf
len = len - cpylen;
page = page_read(dev->blkdev->bd_inode->i_mapping, index);
@@ -324,7 +324,7 @@
memcpy(buf, page_address(page) + offset, cpylen);
page_cache_release(page);
-@@ -136,7 +156,10 @@
+@@ -136,7 +156,10 @@ static int block2mtd_read(struct mtd_inf
offset = 0;
index++;
}
@@ -336,7 +336,7 @@
}
-@@ -188,12 +211,22 @@
+@@ -188,12 +211,22 @@ static int block2mtd_write(struct mtd_in
size_t *retlen, const u_char *buf)
{
struct block2mtd_dev *dev = mtd->priv;
@@ -363,7 +363,7 @@
if (to + len > mtd->size)
len = mtd->size - to;
-@@ -202,6 +235,9 @@
+@@ -202,6 +235,9 @@ static int block2mtd_write(struct mtd_in
mutex_unlock(&dev->write_mutex);
if (err > 0)
err = 0;
@@ -373,7 +373,7 @@
return err;
}
-@@ -210,7 +246,12 @@
+@@ -210,7 +246,12 @@ static int block2mtd_write(struct mtd_in
static void block2mtd_sync(struct mtd_info *mtd)
{
struct block2mtd_dev *dev = mtd->priv;
@@ -387,7 +387,7 @@
return;
}
-@@ -231,31 +272,22 @@
+@@ -231,31 +272,22 @@ static void block2mtd_free_device(struct
kfree(dev);
}
@@ -422,7 +422,7 @@
if (devt) {
bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
}
-@@ -263,17 +295,96 @@
+@@ -263,17 +295,96 @@ static struct block2mtd_dev *add_device(
#endif
if (IS_ERR(bdev)) {
@@ -522,7 +522,7 @@
if (!mtdname)
mtdname = devname;
-@@ -297,6 +408,7 @@
+@@ -297,6 +408,7 @@ static struct block2mtd_dev *add_device(
dev->mtd.read = block2mtd_read;
dev->mtd.priv = dev;
dev->mtd.owner = THIS_MODULE;
@@ -540,7 +540,7 @@
#include <asm/uaccess.h>
-@@ -771,6 +772,13 @@
+@@ -771,6 +772,13 @@ static int mtd_ioctl(struct inode *inode
file->f_pos = 0;
break;
}
@@ -556,7 +556,7 @@
ret = -ENOTTY;
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
-@@ -96,6 +96,7 @@
+@@ -96,6 +96,7 @@ struct mtd_oob_ops {
uint8_t *oobbuf;
};
@@ -564,7 +564,7 @@
struct mtd_info {
u_char type;
u_int32_t flags;
-@@ -211,6 +212,9 @@
+@@ -211,6 +212,9 @@ struct mtd_info {
struct module *owner;
int usecount;
@@ -584,7 +584,7 @@
struct mtd_partition {
char *name; /* identifier string */
u_int32_t size; /* partition size */
-@@ -41,6 +42,7 @@
+@@ -41,6 +42,7 @@ struct mtd_partition {
u_int32_t mask_flags; /* master MTD flags to mask out for this partition */
struct nand_ecclayout *ecclayout; /* out of band layout for this partition (NAND only)*/
struct mtd_info **mtdp; /* pointer to store the MTD object */
@@ -592,7 +592,7 @@
};
#define MTDPART_OFS_NXTBLK (-2)
-@@ -50,6 +52,7 @@
+@@ -50,6 +52,7 @@ struct mtd_partition {
int add_mtd_partitions(struct mtd_info *, const struct mtd_partition *, int);
int del_mtd_partitions(struct mtd_info *);
@@ -602,7 +602,7 @@
* Functions dealing with the various ways of partitioning the space
--- a/include/mtd/mtd-abi.h
+++ b/include/mtd/mtd-abi.h
-@@ -93,6 +93,7 @@
+@@ -93,6 +93,7 @@ struct otp_info {
#define ECCGETLAYOUT _IOR('M', 17, struct nand_ecclayout)
#define ECCGETSTATS _IOR('M', 18, struct mtd_ecc_stats)
#define MTDFILEMODE _IO('M', 19)
diff --git a/target/linux/generic-2.6/patches-2.6.27/070-redboot_space.patch b/target/linux/generic-2.6/patches-2.6.27/070-redboot_space.patch
index e7b3b60e22..6ace83c01a 100644
--- a/target/linux/generic-2.6/patches-2.6.27/070-redboot_space.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/070-redboot_space.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/redboot.c
+++ b/drivers/mtd/redboot.c
-@@ -249,14 +249,21 @@
+@@ -249,14 +249,21 @@ static int parse_redboot_partitions(stru
#endif
names += strlen(names)+1;
diff --git a/target/linux/generic-2.6/patches-2.6.27/071-redboot_boardconfig.patch b/target/linux/generic-2.6/patches-2.6.27/071-redboot_boardconfig.patch
index 2fe1d959e6..f9bc4fe36b 100644
--- a/target/linux/generic-2.6/patches-2.6.27/071-redboot_boardconfig.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/071-redboot_boardconfig.patch
@@ -9,7 +9,7 @@
struct fis_image_desc {
unsigned char name[16]; // Null terminated name
uint32_t flash_base; // Address within FLASH of image
-@@ -41,6 +43,7 @@
+@@ -41,6 +43,7 @@ static int parse_redboot_partitions(stru
struct mtd_partition **pparts,
unsigned long fis_origin)
{
@@ -17,7 +17,7 @@
int nrparts = 0;
struct fis_image_desc *buf;
struct mtd_partition *parts;
-@@ -209,14 +212,14 @@
+@@ -209,14 +212,14 @@ static int parse_redboot_partitions(stru
}
}
#endif
@@ -34,7 +34,7 @@
#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
if (nulllen > 0) {
strcpy(nullname, nullstring);
-@@ -235,6 +238,8 @@
+@@ -235,6 +238,8 @@ static int parse_redboot_partitions(stru
}
#endif
for ( ; i<nrparts; i++) {
@@ -43,7 +43,7 @@
parts[i].size = fl->img->size;
parts[i].offset = fl->img->flash_base;
parts[i].name = names;
-@@ -268,6 +273,14 @@
+@@ -268,6 +273,14 @@ static int parse_redboot_partitions(stru
fl = fl->next;
kfree(tmp_fl);
}
diff --git a/target/linux/generic-2.6/patches-2.6.27/080-mtd_plat_nand_chip_fixup.patch b/target/linux/generic-2.6/patches-2.6.27/080-mtd_plat_nand_chip_fixup.patch
index 2b8954c1fb..62d96ac569 100644
--- a/target/linux/generic-2.6/patches-2.6.27/080-mtd_plat_nand_chip_fixup.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/080-mtd_plat_nand_chip_fixup.patch
@@ -1,6 +1,6 @@
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
-@@ -578,6 +578,7 @@
+@@ -578,6 +578,7 @@ struct platform_nand_chip {
int chip_delay;
unsigned int options;
const char **part_probe_types;
@@ -10,7 +10,7 @@
--- a/drivers/mtd/nand/plat_nand.c
+++ b/drivers/mtd/nand/plat_nand.c
-@@ -71,7 +71,18 @@
+@@ -71,7 +71,18 @@ static int __init plat_nand_probe(struct
platform_set_drvdata(pdev, data);
/* Scan to find existance of the device */
diff --git a/target/linux/generic-2.6/patches-2.6.27/100-netfilter_layer7_2.17.patch b/target/linux/generic-2.6/patches-2.6.27/100-netfilter_layer7_2.17.patch
index c3a5becb54..26b04e51ca 100644
--- a/target/linux/generic-2.6/patches-2.6.27/100-netfilter_layer7_2.17.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/100-netfilter_layer7_2.17.patch
@@ -1,6 +1,6 @@
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
-@@ -757,6 +757,27 @@
+@@ -757,6 +757,27 @@ config NETFILTER_XT_MATCH_STATE
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
-@@ -78,6 +78,7 @@
+@@ -78,6 +78,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RATEEST)
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
-@@ -206,6 +206,14 @@
+@@ -206,6 +206,14 @@ destroy_conntrack(struct nf_conntrack *n
* 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
-@@ -162,7 +162,12 @@
+@@ -162,7 +162,12 @@ static int ct_seq_show(struct seq_file *
return -ENOSPC;
#endif
@@ -2060,7 +2060,7 @@
return 0;
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
-@@ -118,6 +118,22 @@
+@@ -118,6 +118,22 @@ struct nf_conn
u_int32_t secmark;
#endif
diff --git a/target/linux/generic-2.6/patches-2.6.27/101-netfilter_layer7_pktmatch.patch b/target/linux/generic-2.6/patches-2.6.27/101-netfilter_layer7_pktmatch.patch
index dff6d188aa..ad0fdb823f 100644
--- a/target/linux/generic-2.6/patches-2.6.27/101-netfilter_layer7_pktmatch.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/101-netfilter_layer7_pktmatch.patch
@@ -1,6 +1,6 @@
--- a/include/linux/netfilter/xt_layer7.h
+++ b/include/linux/netfilter/xt_layer7.h
-@@ -8,6 +8,7 @@
+@@ -8,6 +8,7 @@ struct xt_layer7_info {
char protocol[MAX_PROTOCOL_LEN];
char pattern[MAX_PATTERN_LEN];
u_int8_t invert;
@@ -10,7 +10,7 @@
#endif /* _XT_LAYER7_H */
--- a/net/netfilter/xt_layer7.c
+++ b/net/netfilter/xt_layer7.c
-@@ -297,34 +297,36 @@
+@@ -297,34 +297,36 @@ static int match_no_append(struct nf_con
}
/* add the new app data to the conntrack. Return number of bytes added. */
@@ -60,7 +60,7 @@
return length;
}
-@@ -411,7 +413,7 @@
+@@ -411,7 +413,7 @@ match(const struct sk_buff *skbin,
const struct xt_layer7_info * info = matchinfo;
enum ip_conntrack_info master_ctinfo, ctinfo;
struct nf_conn *master_conntrack, *conntrack;
@@ -69,7 +69,7 @@
unsigned int pattern_result, appdatalen;
regexp * comppattern;
-@@ -439,8 +441,8 @@
+@@ -439,8 +441,8 @@ match(const struct sk_buff *skbin,
master_conntrack = master_ct(master_conntrack);
/* if we've classified it or seen too many packets */
@@ -80,7 +80,7 @@
pattern_result = match_no_append(conntrack, master_conntrack,
ctinfo, master_ctinfo, info);
-@@ -473,6 +475,25 @@
+@@ -473,6 +475,25 @@ match(const struct sk_buff *skbin,
/* the return value gets checked later, when we're ready to use it */
comppattern = compile_and_cache(info->pattern, info->protocol);
diff --git a/target/linux/generic-2.6/patches-2.6.27/110-ipp2p_0.8.1rc1.patch b/target/linux/generic-2.6/patches-2.6.27/110-ipp2p_0.8.1rc1.patch
index e769247c39..3684ff4a15 100644
--- a/target/linux/generic-2.6/patches-2.6.27/110-ipp2p_0.8.1rc1.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/110-ipp2p_0.8.1rc1.patch
@@ -893,7 +893,7 @@
+
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
-@@ -57,6 +57,12 @@
+@@ -57,6 +57,12 @@ config IP_NF_IPTABLES
To compile it as a module, choose M here. If unsure, say N.
# The matches.
@@ -908,7 +908,7 @@
depends on IP_NF_IPTABLES
--- a/net/ipv4/netfilter/Makefile
+++ b/net/ipv4/netfilter/Makefile
-@@ -51,6 +51,8 @@
+@@ -51,6 +51,8 @@ obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn
obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
diff --git a/target/linux/generic-2.6/patches-2.6.27/130-netfilter_ipset.patch b/target/linux/generic-2.6/patches-2.6.27/130-netfilter_ipset.patch
index d5bc2b7196..fec3e3d907 100644
--- a/target/linux/generic-2.6/patches-2.6.27/130-netfilter_ipset.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/130-netfilter_ipset.patch
@@ -7517,7 +7517,7 @@
+module_exit(ipt_SET_fini);
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
-@@ -412,5 +412,122 @@
+@@ -412,5 +412,122 @@ config IP_NF_ARP_MANGLE
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
-@@ -50,6 +50,7 @@
+@@ -50,6 +50,7 @@ obj-$(CONFIG_IP_NF_MATCH_AH) += ipt_ah.o
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
-@@ -63,6 +64,18 @@
+@@ -63,6 +64,18 @@ obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += i
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
diff --git a/target/linux/generic-2.6/patches-2.6.27/140-netfilter_time.patch b/target/linux/generic-2.6/patches-2.6.27/140-netfilter_time.patch
index aecc852ead..d5dddc1739 100644
--- a/target/linux/generic-2.6/patches-2.6.27/140-netfilter_time.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/140-netfilter_time.patch
@@ -204,7 +204,7 @@
+}
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
-@@ -63,6 +63,22 @@
+@@ -63,6 +63,22 @@ config IP_NF_MATCH_IPP2P
help
Module for matching traffic of various Peer-to-Peer applications
@@ -229,7 +229,7 @@
depends on IP_NF_IPTABLES
--- a/net/ipv4/netfilter/Makefile
+++ b/net/ipv4/netfilter/Makefile
-@@ -51,6 +51,7 @@
+@@ -51,6 +51,7 @@ obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn
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
diff --git a/target/linux/generic-2.6/patches-2.6.27/150-netfilter_imq.patch b/target/linux/generic-2.6/patches-2.6.27/150-netfilter_imq.patch
index 7f64e37ca9..54928d9054 100644
--- a/target/linux/generic-2.6/patches-2.6.27/150-netfilter_imq.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/150-netfilter_imq.patch
@@ -477,7 +477,7 @@
+
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
-@@ -109,6 +109,129 @@
+@@ -109,6 +109,129 @@ config EQUALIZER
To compile this driver as a module, choose M here: the module
will be called eql. If unsure, say N.
@@ -609,7 +609,7 @@
select CRC32
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
-@@ -144,6 +144,7 @@
+@@ -144,6 +144,7 @@ obj-$(CONFIG_SLHC) += slhc.o
obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
obj-$(CONFIG_DUMMY) += dummy.o
@@ -653,7 +653,7 @@
+#endif /* _IP6T_IMQ_H */
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
-@@ -302,6 +302,10 @@
+@@ -302,6 +302,10 @@ struct sk_buff {
struct nf_conntrack *nfct;
struct sk_buff *nfct_reasm;
#endif
@@ -664,7 +664,7 @@
#ifdef CONFIG_BRIDGE_NETFILTER
struct nf_bridge_info *nf_bridge;
#endif
-@@ -1642,6 +1646,10 @@
+@@ -1642,6 +1646,10 @@ static inline void __nf_copy(struct sk_b
dst->nfct_reasm = src->nfct_reasm;
nf_conntrack_get_reasm(src->nfct_reasm);
#endif
@@ -687,7 +687,7 @@
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <linux/stat.h>
-@@ -1624,7 +1627,11 @@
+@@ -1624,7 +1627,11 @@ int dev_hard_start_xmit(struct sk_buff *
struct netdev_queue *txq)
{
if (likely(!skb->next)) {
@@ -774,7 +774,7 @@
+MODULE_LICENSE("GPL");
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
-@@ -145,6 +145,17 @@
+@@ -145,6 +145,17 @@ config IP_NF_FILTER
To compile it as a module, choose M here. If unsure, say N.
@@ -794,7 +794,7 @@
depends on IP_NF_FILTER
--- a/net/ipv4/netfilter/Makefile
+++ b/net/ipv4/netfilter/Makefile
-@@ -59,6 +59,7 @@
+@@ -59,6 +59,7 @@ obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_i
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
@@ -876,7 +876,7 @@
+MODULE_LICENSE("GPL");
--- a/net/ipv6/netfilter/Kconfig
+++ b/net/ipv6/netfilter/Kconfig
-@@ -179,6 +179,15 @@
+@@ -179,6 +179,15 @@ config IP6_NF_MANGLE
To compile it as a module, choose M here. If unsure, say N.
@@ -904,7 +904,7 @@
obj-$(CONFIG_IP6_NF_SECURITY) += ip6table_security.o
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
-@@ -188,6 +188,7 @@
+@@ -188,6 +188,7 @@ void __qdisc_run(struct Qdisc *q)
clear_bit(__QDISC_STATE_RUNNING, &q->state);
}
diff --git a/target/linux/generic-2.6/patches-2.6.27/170-netfilter_chaostables_0.8.patch b/target/linux/generic-2.6/patches-2.6.27/170-netfilter_chaostables_0.8.patch
index b8bbeb8a31..b1204a7760 100644
--- a/target/linux/generic-2.6/patches-2.6.27/170-netfilter_chaostables_0.8.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/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
-@@ -296,6 +296,14 @@
+@@ -296,6 +296,14 @@ config NETFILTER_XTABLES
# alphabetically ordered list of targets
@@ -110,7 +110,7 @@
config NETFILTER_XT_TARGET_CLASSIFY
tristate '"CLASSIFY" target support'
depends on NETFILTER_XTABLES
-@@ -325,6 +333,14 @@
+@@ -325,6 +333,14 @@ config NETFILTER_XT_TARGET_CONNMARK
<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
-@@ -661,6 +677,14 @@
+@@ -661,6 +677,14 @@ config NETFILTER_XT_MATCH_POLICY
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
-@@ -51,6 +51,8 @@
+@@ -51,6 +51,8 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_SECMARK
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
-@@ -84,3 +86,4 @@
+@@ -84,3 +86,4 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_STRING)
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
-@@ -1555,6 +1555,8 @@
+@@ -1555,6 +1555,8 @@ __u32 secure_tcp_sequence_number(__be32
return seq;
}
diff --git a/target/linux/generic-2.6/patches-2.6.27/171-netfilter_tarpit.patch b/target/linux/generic-2.6/patches-2.6.27/171-netfilter_tarpit.patch
index 9026f96a9b..9a3433bd75 100644
--- a/target/linux/generic-2.6/patches-2.6.27/171-netfilter_tarpit.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/171-netfilter_tarpit.patch
@@ -1,6 +1,6 @@
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
-@@ -457,6 +457,23 @@
+@@ -457,6 +457,23 @@ config NETFILTER_XT_TARGET_CONNSECMARK
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
-@@ -48,6 +48,7 @@
+@@ -48,6 +48,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_NFQUEUE
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
diff --git a/target/linux/generic-2.6/patches-2.6.27/180-netfilter_depends.patch b/target/linux/generic-2.6/patches-2.6.27/180-netfilter_depends.patch
index f2e721acc5..8301e54054 100644
--- a/target/linux/generic-2.6/patches-2.6.27/180-netfilter_depends.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/180-netfilter_depends.patch
@@ -1,6 +1,6 @@
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
-@@ -165,7 +165,7 @@
+@@ -165,7 +165,7 @@ config NF_CONNTRACK_FTP
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
-@@ -476,7 +476,7 @@
+@@ -476,7 +476,7 @@ config NETFILTER_XT_TARGET_TARPIT
config NETFILTER_XT_TARGET_TCPMSS
tristate '"TCPMSS" target support'
diff --git a/target/linux/generic-2.6/patches-2.6.27/190-netfilter_rtsp.patch b/target/linux/generic-2.6/patches-2.6.27/190-netfilter_rtsp.patch
index 7ee2d4beba..d77bf0a9af 100644
--- a/target/linux/generic-2.6/patches-2.6.27/190-netfilter_rtsp.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/190-netfilter_rtsp.patch
@@ -294,7 +294,7 @@
+#endif /* _NETFILTER_MIME_H */
--- a/net/ipv4/netfilter/Makefile
+++ b/net/ipv4/netfilter/Makefile
-@@ -23,6 +23,7 @@
+@@ -23,6 +23,7 @@ obj-$(CONFIG_NF_NAT_AMANDA) += nf_nat_am
obj-$(CONFIG_NF_NAT_FTP) += nf_nat_ftp.o
obj-$(CONFIG_NF_NAT_H323) += nf_nat_h323.o
obj-$(CONFIG_NF_NAT_IRC) += nf_nat_irc.o
@@ -304,7 +304,7 @@
obj-$(CONFIG_NF_NAT_SNMP_BASIC) += nf_nat_snmp_basic.o
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
-@@ -278,6 +278,16 @@
+@@ -278,6 +278,16 @@ config NF_CONNTRACK_TFTP
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
-@@ -33,6 +33,7 @@
+@@ -33,6 +33,7 @@ obj-$(CONFIG_NF_CONNTRACK_PPTP) += nf_co
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
-@@ -303,6 +303,11 @@
+@@ -303,6 +303,11 @@ config NF_NAT_IRC
depends on IP_NF_IPTABLES && NF_CONNTRACK && NF_NAT
default NF_NAT && NF_CONNTRACK_IRC
diff --git a/target/linux/generic-2.6/patches-2.6.27/200-sched_esfq.patch b/target/linux/generic-2.6/patches-2.6.27/200-sched_esfq.patch
index 9402a5794d..8c8b56bcd0 100644
--- a/target/linux/generic-2.6/patches-2.6.27/200-sched_esfq.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/200-sched_esfq.patch
@@ -1,6 +1,6 @@
--- a/include/linux/pkt_sched.h
+++ b/include/linux/pkt_sched.h
-@@ -173,8 +173,37 @@
+@@ -173,8 +173,37 @@ struct tc_sfq_xstats
*
* The only reason for this is efficiency, it is possible
* to change these parameters in compile time.
@@ -40,7 +40,7 @@
enum
--- a/net/sched/Kconfig
+++ b/net/sched/Kconfig
-@@ -128,6 +128,37 @@
+@@ -128,6 +128,37 @@ config NET_SCH_SFQ
To compile this code as a module, choose M here: the
module will be called sch_sfq.
@@ -80,7 +80,7 @@
---help---
--- a/net/sched/Makefile
+++ b/net/sched/Makefile
-@@ -23,6 +23,7 @@
+@@ -23,6 +23,7 @@ obj-$(CONFIG_NET_SCH_GRED) += sch_gred.o
obj-$(CONFIG_NET_SCH_INGRESS) += sch_ingress.o
obj-$(CONFIG_NET_SCH_DSMARK) += sch_dsmark.o
obj-$(CONFIG_NET_SCH_SFQ) += sch_sfq.o
diff --git a/target/linux/generic-2.6/patches-2.6.27/202-mips-freestanding.patch b/target/linux/generic-2.6/patches-2.6.27/202-mips-freestanding.patch
index 52b6825dcb..156510b02d 100644
--- a/target/linux/generic-2.6/patches-2.6.27/202-mips-freestanding.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/202-mips-freestanding.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
-@@ -577,6 +577,9 @@
+@@ -577,6 +577,9 @@ core-$(CONFIG_TOSHIBA_RBTX4927) += arch/
#
core-$(CONFIG_TOSHIBA_RBTX4938) += arch/mips/txx9/rbtx4938/
diff --git a/target/linux/generic-2.6/patches-2.6.27/204-jffs2_eofdetect.patch b/target/linux/generic-2.6/patches-2.6.27/204-jffs2_eofdetect.patch
index 17a082d2c2..16d3e1f8e8 100644
--- a/target/linux/generic-2.6/patches-2.6.27/204-jffs2_eofdetect.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/204-jffs2_eofdetect.patch
@@ -1,6 +1,6 @@
--- a/fs/jffs2/build.c
+++ b/fs/jffs2/build.c
-@@ -111,6 +111,17 @@
+@@ -111,6 +111,17 @@ static int jffs2_build_filesystem(struct
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
-@@ -72,7 +72,7 @@
+@@ -72,7 +72,7 @@ static int file_dirty(struct jffs2_sb_in
return ret;
if ((ret = jffs2_scan_dirty_space(c, jeb, jeb->free_size)))
return ret;
@@ -29,7 +29,7 @@
think it's recoverable now. */
jeb->dirty_size += jeb->wasted_size;
c->dirty_size += jeb->wasted_size;
-@@ -144,8 +144,11 @@
+@@ -144,8 +144,11 @@ int jffs2_scan_medium(struct jffs2_sb_in
/* reset summary info for next eraseblock scan */
jffs2_sum_reset_collected(s);
@@ -43,7 +43,7 @@
if (ret < 0)
goto out;
-@@ -400,7 +403,7 @@
+@@ -400,7 +403,7 @@ static int jffs2_scan_xref_node(struct j
if (!ref)
return -ENOMEM;
@@ -52,7 +52,7 @@
* and AFTER xattr_ref is marked as a dead xref,
* ref->xid is used to store 32bit xid, xd is not used
* ref->ino is used to store 32bit inode-number, ic is not used
-@@ -473,7 +476,7 @@
+@@ -473,7 +476,7 @@ static int jffs2_scan_eraseblock (struct
struct jffs2_sum_marker *sm;
void *sumptr = NULL;
uint32_t sumlen;
@@ -61,7 +61,7 @@
if (!buf_size) {
/* XIP case. Just look, point at the summary if it's there */
sm = (void *)buf + c->sector_size - sizeof(*sm);
-@@ -489,9 +492,9 @@
+@@ -489,9 +492,9 @@ static int jffs2_scan_eraseblock (struct
buf_len = sizeof(*sm);
/* Read as much as we want into the _end_ of the preallocated buffer */
@@ -73,7 +73,7 @@
if (err)
return err;
-@@ -510,9 +513,9 @@
+@@ -510,9 +513,9 @@ static int jffs2_scan_eraseblock (struct
}
if (buf_len < sumlen) {
/* Need to read more so that the entire summary node is present */
@@ -85,7 +85,7 @@
if (err)
return err;
}
-@@ -525,7 +528,7 @@
+@@ -525,7 +528,7 @@ static int jffs2_scan_eraseblock (struct
if (buf_size && sumlen > buf_size)
kfree(sumptr);
@@ -94,7 +94,7 @@
If it returns positive, that's a block classification
(i.e. BLK_STATE_xxx) so return that too.
If it returns zero, fall through to full scan. */
-@@ -546,6 +549,17 @@
+@@ -546,6 +549,17 @@ static int jffs2_scan_eraseblock (struct
return err;
}
@@ -112,7 +112,7 @@
/* We temporarily use 'ofs' as a pointer into the buffer/jeb */
ofs = 0;
-@@ -671,7 +685,7 @@
+@@ -671,7 +685,7 @@ scan_more:
scan_end = buf_len;
goto more_empty;
}
@@ -121,7 +121,7 @@
/* See how much more there is to read in this eraseblock... */
buf_len = min_t(uint32_t, buf_size, jeb->offset + c->sector_size - ofs);
if (!buf_len) {
-@@ -907,7 +921,7 @@
+@@ -907,7 +921,7 @@ scan_more:
D1(printk(KERN_DEBUG "Block at 0x%08x: free 0x%08x, dirty 0x%08x, unchecked 0x%08x, used 0x%08x, wasted 0x%08x\n",
jeb->offset,jeb->free_size, jeb->dirty_size, jeb->unchecked_size, jeb->used_size, jeb->wasted_size));
diff --git a/target/linux/generic-2.6/patches-2.6.27/208-rtl8110sb_fix.patch b/target/linux/generic-2.6/patches-2.6.27/208-rtl8110sb_fix.patch
index 6289f527b4..6f8184e68c 100644
--- a/target/linux/generic-2.6/patches-2.6.27/208-rtl8110sb_fix.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/208-rtl8110sb_fix.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
-@@ -1519,7 +1519,7 @@
+@@ -1519,7 +1519,7 @@ static const struct rtl_cfg_info {
.hw_start = rtl_hw_start_8169,
.region = 1,
.align = 0,
@@ -9,7 +9,7 @@
RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
.napi_event = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
.msi = 0
-@@ -1528,7 +1528,7 @@
+@@ -1528,7 +1528,7 @@ static const struct rtl_cfg_info {
.hw_start = rtl_hw_start_8168,
.region = 2,
.align = 8,
@@ -18,7 +18,7 @@
TxErr | TxOK | RxOK | RxErr,
.napi_event = TxErr | TxOK | RxOK | RxOverflow,
.msi = RTL_FEATURE_MSI
-@@ -1537,7 +1537,7 @@
+@@ -1537,7 +1537,7 @@ static const struct rtl_cfg_info {
.hw_start = rtl_hw_start_8101,
.region = 2,
.align = 8,
@@ -27,7 +27,7 @@
RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
.napi_event = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
.msi = RTL_FEATURE_MSI
-@@ -2873,10 +2873,12 @@
+@@ -2873,10 +2873,12 @@ static irqreturn_t rtl8169_interrupt(int
goto out;
}
diff --git a/target/linux/generic-2.6/patches-2.6.27/209-mini_fo.patch b/target/linux/generic-2.6/patches-2.6.27/209-mini_fo.patch
index 3e64c1f397..d4abd92226 100644
--- a/target/linux/generic-2.6/patches-2.6.27/209-mini_fo.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/209-mini_fo.patch
@@ -1,6 +1,6 @@
--- a/fs/Kconfig
+++ b/fs/Kconfig
-@@ -1430,6 +1430,9 @@
+@@ -1430,6 +1430,9 @@ config VXFS_FS
To compile this as a module, choose M here: the module will be
called freevxfs. If unsure, say N.
@@ -12,7 +12,7 @@
depends on BLOCK
--- a/fs/Makefile
+++ b/fs/Makefile
-@@ -78,6 +78,7 @@
+@@ -78,6 +78,7 @@ obj-$(CONFIG_SQUASHFS) += squashfs/
obj-y += ramfs/
obj-$(CONFIG_HUGETLBFS) += hugetlbfs/
obj-$(CONFIG_CODA_FS) += coda/
diff --git a/target/linux/generic-2.6/patches-2.6.27/210-mini_fo_2.6.25_fixes.patch b/target/linux/generic-2.6/patches-2.6.27/210-mini_fo_2.6.25_fixes.patch
index 22ca3900e9..d71e3b6faa 100644
--- a/target/linux/generic-2.6/patches-2.6.27/210-mini_fo_2.6.25_fixes.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/210-mini_fo_2.6.25_fixes.patch
@@ -1,6 +1,6 @@
--- a/fs/mini_fo/main.c
+++ b/fs/mini_fo/main.c
-@@ -79,6 +79,7 @@
+@@ -79,6 +79,7 @@ mini_fo_tri_interpose(dentry_t *hidden_d
* of the new inode's fields
*/
@@ -8,7 +8,7 @@
/*
* original: inode = iget(sb, hidden_inode->i_ino);
*/
-@@ -87,6 +88,13 @@
+@@ -87,6 +88,13 @@ mini_fo_tri_interpose(dentry_t *hidden_d
err = -EACCES; /* should be impossible??? */
goto out;
}
@@ -22,7 +22,7 @@
/*
* interpose the inode if not already interposed
-@@ -184,9 +192,9 @@
+@@ -184,9 +192,9 @@ mini_fo_parse_options(super_block_t *sb,
hidden_root = ERR_PTR(err);
goto out;
}
@@ -35,7 +35,7 @@
} else if(!strncmp("sto=", options, 4)) {
/* parse the storage dir */
-@@ -204,9 +212,9 @@
+@@ -204,9 +212,9 @@ mini_fo_parse_options(super_block_t *sb,
hidden_root2 = ERR_PTR(err);
goto out;
}
@@ -50,7 +50,7 @@
/* validate storage dir, this is done in
--- a/fs/mini_fo/mini_fo.h
+++ b/fs/mini_fo/mini_fo.h
-@@ -302,6 +302,10 @@
+@@ -302,6 +302,10 @@ extern int mini_fo_tri_interpose(dentry_
extern int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
dentry_t *src_dentry, struct vfsmount *src_mnt);
@@ -61,7 +61,7 @@
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd);
-@@ -501,6 +505,29 @@
+@@ -501,6 +505,29 @@ static inline void double_unlock(struct
#endif /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */
#endif /* __KERNEL__ */
@@ -93,7 +93,7 @@
*/
--- a/fs/mini_fo/super.c
+++ b/fs/mini_fo/super.c
-@@ -262,10 +262,31 @@
+@@ -262,10 +262,31 @@ mini_fo_umount_begin(super_block_t *sb)
}
#endif
@@ -127,7 +127,7 @@
#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
--- a/fs/mini_fo/aux.c
+++ b/fs/mini_fo/aux.c
-@@ -164,11 +164,11 @@
+@@ -164,11 +164,11 @@ dentry_t *bpath_walk(super_block_t *sb,
err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd);
/* validate */
diff --git a/target/linux/generic-2.6/patches-2.6.27/211-mini_fo_2.6.25_dentry_open_war.patch b/target/linux/generic-2.6/patches-2.6.27/211-mini_fo_2.6.25_dentry_open_war.patch
index 14a9f37666..48a19429b9 100644
--- a/target/linux/generic-2.6/patches-2.6.27/211-mini_fo_2.6.25_dentry_open_war.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/211-mini_fo_2.6.25_dentry_open_war.patch
@@ -1,6 +1,6 @@
--- a/fs/mini_fo/meta.c
+++ b/fs/mini_fo/meta.c
-@@ -442,6 +442,11 @@
+@@ -442,6 +442,11 @@ int meta_write_d_entry(dentry_t *dentry,
S_IRUSR | S_IWUSR);
#endif
}
@@ -12,7 +12,7 @@
/* open META-file for writing */
meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
if(!meta_file || IS_ERR(meta_file)) {
-@@ -535,6 +540,11 @@
+@@ -535,6 +540,11 @@ int meta_write_r_entry(dentry_t *dentry,
meta_dentry, S_IRUSR | S_IWUSR);
#endif
}
@@ -24,7 +24,7 @@
/* open META-file for writing */
meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
if(!meta_file || IS_ERR(meta_file)) {
-@@ -671,14 +681,16 @@
+@@ -671,14 +681,16 @@ int meta_sync_d_list(dentry_t *dentry, i
}
}
@@ -44,7 +44,7 @@
dput(meta_dentry);
err = -1;
goto out;
-@@ -811,14 +823,16 @@
+@@ -811,14 +823,16 @@ int meta_sync_r_list(dentry_t *dentry, i
}
}
diff --git a/target/linux/generic-2.6/patches-2.6.27/212-mini_fo_2.6.26_fixes.patch b/target/linux/generic-2.6/patches-2.6.27/212-mini_fo_2.6.26_fixes.patch
index f4a4572b45..8bd9ba3244 100644
--- a/target/linux/generic-2.6/patches-2.6.27/212-mini_fo_2.6.26_fixes.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/212-mini_fo_2.6.26_fixes.patch
@@ -1,6 +1,6 @@
--- a/fs/mini_fo/super.c
+++ b/fs/mini_fo/super.c
-@@ -84,6 +84,7 @@
+@@ -84,6 +84,7 @@ mini_fo_write_inode(inode_t *inode, int
#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
@@ -8,7 +8,7 @@
STATIC void
mini_fo_put_inode(inode_t *inode)
{
-@@ -99,6 +100,7 @@
+@@ -99,6 +100,7 @@ mini_fo_put_inode(inode_t *inode)
if (atomic_read(&inode->i_count) == 1)
inode->i_nlink = 0;
}
@@ -16,7 +16,7 @@
#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
-@@ -238,7 +240,7 @@
+@@ -238,7 +240,7 @@ mini_fo_clear_inode(inode_t *inode)
* dies.
*/
STATIC void
@@ -25,7 +25,7 @@
mini_fo_umount_begin(struct vfsmount *mnt, int flags)
{
struct vfsmount *hidden_mnt;
-@@ -290,7 +292,9 @@
+@@ -290,7 +292,9 @@ struct super_operations mini_fo_sops =
#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
write_inode: mini_fo_write_inode,
#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
diff --git a/target/linux/generic-2.6/patches-2.6.27/213-mini_fo_2.6.27_fixes.patch b/target/linux/generic-2.6/patches-2.6.27/213-mini_fo_2.6.27_fixes.patch
index 6e995911a4..f92c18b254 100644
--- a/target/linux/generic-2.6/patches-2.6.27/213-mini_fo_2.6.27_fixes.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/213-mini_fo_2.6.27_fixes.patch
@@ -1,6 +1,6 @@
--- a/fs/mini_fo/inode.c
+++ b/fs/mini_fo/inode.c
-@@ -439,7 +439,7 @@
+@@ -439,7 +439,7 @@ mini_fo_symlink(inode_t *dir, dentry_t *
int err=0;
dentry_t *hidden_sto_dentry;
dentry_t *hidden_sto_dir_dentry;
@@ -9,7 +9,7 @@
umode_t mode;
#endif
-@@ -466,7 +466,7 @@
+@@ -466,7 +466,7 @@ mini_fo_symlink(inode_t *dir, dentry_t *
down(&hidden_sto_dir_dentry->d_inode->i_sem);
#endif
@@ -18,7 +18,7 @@
mode = S_IALLUGO;
err = vfs_symlink(hidden_sto_dir_dentry->d_inode,
hidden_sto_dentry, symname, mode);
-@@ -1128,7 +1128,7 @@
+@@ -1128,7 +1128,7 @@ void mini_fo_put_link(struct dentry *den
#endif
STATIC int
@@ -27,7 +27,7 @@
mini_fo_permission(inode_t *inode, int mask, struct nameidata *nd)
#else
mini_fo_permission(inode_t *inode, int mask)
-@@ -1150,8 +1150,9 @@
+@@ -1150,8 +1150,9 @@ mini_fo_permission(inode_t *inode, int m
* if (err)
* goto out;
*/
diff --git a/target/linux/generic-2.6/patches-2.6.27/219-kobject_uevent.patch b/target/linux/generic-2.6/patches-2.6.27/219-kobject_uevent.patch
index 93ed1d035c..279665e869 100644
--- a/target/linux/generic-2.6/patches-2.6.27/219-kobject_uevent.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/219-kobject_uevent.patch
@@ -1,6 +1,6 @@
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
-@@ -29,7 +29,8 @@
+@@ -29,7 +29,8 @@ u64 uevent_seqnum;
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 */
-@@ -42,6 +43,18 @@
+@@ -42,6 +43,18 @@ static const char *kobject_actions[] = {
[KOBJ_OFFLINE] = "offline",
};
@@ -29,7 +29,7 @@
/**
* kobject_action_type - translate action string to numeric type
*
-@@ -194,9 +207,7 @@
+@@ -194,9 +207,7 @@ int kobject_uevent_env(struct kobject *k
kobj->state_remove_uevent_sent = 1;
/* we will send an event, so request a new sequence number */
diff --git a/target/linux/generic-2.6/patches-2.6.27/220-sound_kconfig.patch b/target/linux/generic-2.6/patches-2.6.27/220-sound_kconfig.patch
index c514f890f0..f374009a65 100644
--- a/target/linux/generic-2.6/patches-2.6.27/220-sound_kconfig.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/220-sound_kconfig.patch
@@ -1,6 +1,6 @@
--- a/sound/core/Kconfig
+++ b/sound/core/Kconfig
-@@ -7,7 +7,7 @@
+@@ -7,7 +7,7 @@ config SND_PCM
select SND_TIMER
config SND_HWDEP
diff --git a/target/linux/generic-2.6/patches-2.6.27/400-ledtrig_morse.patch b/target/linux/generic-2.6/patches-2.6.27/400-ledtrig_morse.patch
index b0a3b2a68f..b7df26e708 100644
--- a/target/linux/generic-2.6/patches-2.6.27/400-ledtrig_morse.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/400-ledtrig_morse.patch
@@ -1,6 +1,6 @@
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
-@@ -206,4 +206,8 @@
+@@ -206,4 +206,8 @@ config LEDS_TRIGGER_DEFAULT_ON
This allows LEDs to be initialised in the ON state.
If unsure, say Y.
@@ -11,7 +11,7 @@
endif # NEW_LEDS
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
-@@ -29,3 +29,4 @@
+@@ -29,3 +29,4 @@ obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledt
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
diff --git a/target/linux/generic-2.6/patches-2.6.27/401-led_alix.patch b/target/linux/generic-2.6/patches-2.6.27/401-led_alix.patch
index 1bec37ecba..80e5401c7b 100644
--- a/target/linux/generic-2.6/patches-2.6.27/401-led_alix.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/401-led_alix.patch
@@ -1,6 +1,6 @@
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
-@@ -77,6 +77,12 @@
+@@ -77,6 +77,12 @@ config LEDS_WRAP
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
-@@ -13,6 +13,7 @@
+@@ -13,6 +13,7 @@ obj-$(CONFIG_LEDS_S3C24XX) += leds-s3c2
obj-$(CONFIG_LEDS_AMS_DELTA) += leds-ams-delta.o
obj-$(CONFIG_LEDS_NET48XX) += leds-net48xx.o
obj-$(CONFIG_LEDS_WRAP) += leds-wrap.o
diff --git a/target/linux/generic-2.6/patches-2.6.27/402-ledtrig_netdev.patch b/target/linux/generic-2.6/patches-2.6.27/402-ledtrig_netdev.patch
index c6e518a37a..3b5ad97a1c 100644
--- a/target/linux/generic-2.6/patches-2.6.27/402-ledtrig_netdev.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/402-ledtrig_netdev.patch
@@ -1,6 +1,6 @@
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
-@@ -216,4 +216,11 @@
+@@ -216,4 +216,11 @@ config LEDS_TRIGGER_MORSE
tristate "LED Morse Trigger"
depends on LEDS_TRIGGERS
@@ -14,7 +14,7 @@
endif # NEW_LEDS
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
-@@ -31,3 +31,4 @@
+@@ -31,3 +31,4 @@ obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK) += l
obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) += ledtrig-heartbeat.o
obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o
obj-$(CONFIG_LEDS_TRIGGER_MORSE) += ledtrig-morse.o
diff --git a/target/linux/generic-2.6/patches-2.6.27/410-gpio_buttons.patch b/target/linux/generic-2.6/patches-2.6.27/410-gpio_buttons.patch
index 61c3508e12..20201aa90a 100644
--- a/target/linux/generic-2.6/patches-2.6.27/410-gpio_buttons.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/410-gpio_buttons.patch
@@ -1,6 +1,6 @@
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
-@@ -207,4 +207,20 @@
+@@ -207,4 +207,20 @@ config HP_SDC_RTC
Say Y here if you want to support the built-in real time clock
of the HP SDC controller.
@@ -23,7 +23,7 @@
endif
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
-@@ -20,3 +20,4 @@
+@@ -20,3 +20,4 @@ obj-$(CONFIG_HP_SDC_RTC) += hp_sdc_rtc.
obj-$(CONFIG_INPUT_UINPUT) += uinput.o
obj-$(CONFIG_INPUT_APANEL) += apanel.o
obj-$(CONFIG_INPUT_SGI_BTNS) += sgi_btns.o
diff --git a/target/linux/generic-2.6/patches-2.6.27/420-gpiodev.patch b/target/linux/generic-2.6/patches-2.6.27/420-gpiodev.patch
index 4daadc8638..da17f8d7e5 100644
--- a/target/linux/generic-2.6/patches-2.6.27/420-gpiodev.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/420-gpiodev.patch
@@ -1,6 +1,6 @@
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
-@@ -1010,6 +1010,13 @@
+@@ -1010,6 +1010,13 @@ config CS5535_GPIO
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 @@
+@@ -94,6 +94,7 @@ obj-$(CONFIG_SCx200_GPIO) += scx200_gpio
obj-$(CONFIG_PC8736x_GPIO) += pc8736x_gpio.o
obj-$(CONFIG_NSC_GPIO) += nsc_gpio.o
obj-$(CONFIG_CS5535_GPIO) += cs5535_gpio.o
diff --git a/target/linux/generic-2.6/patches-2.6.27/510-yaffs_support.patch b/target/linux/generic-2.6/patches-2.6.27/510-yaffs_support.patch
index db10deb9c5..8c01f0a74c 100644
--- a/target/linux/generic-2.6/patches-2.6.27/510-yaffs_support.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/510-yaffs_support.patch
@@ -1,6 +1,6 @@
--- a/fs/Kconfig
+++ b/fs/Kconfig
-@@ -421,6 +421,7 @@
+@@ -421,6 +421,7 @@ config FS_POSIX_ACL
source "fs/xfs/Kconfig"
source "fs/gfs2/Kconfig"
@@ -10,7 +10,7 @@
tristate "OCFS2 file system support"
--- a/fs/Makefile
+++ b/fs/Makefile
-@@ -124,3 +124,4 @@
+@@ -124,3 +124,4 @@ obj-$(CONFIG_HPPFS) += hppfs/
obj-$(CONFIG_DEBUG_FS) += debugfs/
obj-$(CONFIG_OCFS2_FS) += ocfs2/
obj-$(CONFIG_GFS2_FS) += gfs2/
diff --git a/target/linux/generic-2.6/patches-2.6.27/512-yaffs_2.6.25_fix.patch b/target/linux/generic-2.6/patches-2.6.27/512-yaffs_2.6.25_fix.patch
index ac895342f6..c127336346 100644
--- a/target/linux/generic-2.6/patches-2.6.27/512-yaffs_2.6.25_fix.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/512-yaffs_2.6.25_fix.patch
@@ -1,6 +1,6 @@
--- a/fs/yaffs2/yaffs_fs.c
+++ b/fs/yaffs2/yaffs_fs.c
-@@ -181,7 +181,13 @@
+@@ -181,7 +181,13 @@ static int yaffs_statfs(struct super_blo
#else
static int yaffs_statfs(struct super_block *sb, struct statfs *buf);
#endif
@@ -14,7 +14,7 @@
static void yaffs_put_inode(struct inode *inode);
static void yaffs_delete_inode(struct inode *);
-@@ -284,7 +290,9 @@
+@@ -284,7 +290,9 @@ static struct file_operations yaffs_dir_
static struct super_operations yaffs_super_ops = {
.statfs = yaffs_statfs,
@@ -24,7 +24,7 @@
.put_inode = yaffs_put_inode,
.put_super = yaffs_put_super,
.delete_inode = yaffs_delete_inode,
-@@ -844,11 +852,17 @@
+@@ -844,11 +852,17 @@ struct inode *yaffs_get_inode(struct sup
T(YAFFS_TRACE_OS,
(KERN_DEBUG "yaffs_get_inode for object %d\n", obj->objectId));
@@ -42,7 +42,7 @@
return inode;
}
-@@ -1427,6 +1441,39 @@
+@@ -1427,6 +1441,39 @@ static int yaffs_sync_fs(struct super_bl
}
@@ -82,7 +82,7 @@
static void yaffs_read_inode(struct inode *inode)
{
/* NB This is called as a side effect of other functions, but
-@@ -1448,6 +1495,7 @@
+@@ -1448,6 +1495,7 @@ static void yaffs_read_inode(struct inod
yaffs_GrossUnlock(dev);
}
diff --git a/target/linux/generic-2.6/patches-2.6.27/513-yaffs_2.6.26_fix.patch b/target/linux/generic-2.6/patches-2.6.27/513-yaffs_2.6.26_fix.patch
index 32bd3a5d57..11594547d1 100644
--- a/target/linux/generic-2.6/patches-2.6.27/513-yaffs_2.6.26_fix.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/513-yaffs_2.6.26_fix.patch
@@ -1,6 +1,6 @@
--- a/fs/yaffs2/yaffs_fs.c
+++ b/fs/yaffs2/yaffs_fs.c
-@@ -76,6 +76,12 @@
+@@ -76,6 +76,12 @@ extern const char *yaffs_guts_c_version;
#endif
@@ -13,7 +13,7 @@
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
#define WRITE_SIZE_STR "writesize"
#define WRITE_SIZE(mtd) (mtd)->writesize
-@@ -189,7 +195,9 @@
+@@ -189,7 +195,9 @@ static void yaffs_read_inode(struct inod
#endif
@@ -23,7 +23,7 @@
static void yaffs_delete_inode(struct inode *);
static void yaffs_clear_inode(struct inode *);
-@@ -293,7 +301,9 @@
+@@ -293,7 +301,9 @@ static struct super_operations yaffs_sup
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25))
.read_inode = yaffs_read_inode,
#endif
@@ -33,7 +33,7 @@
.put_super = yaffs_put_super,
.delete_inode = yaffs_delete_inode,
.clear_inode = yaffs_clear_inode,
-@@ -437,6 +447,7 @@
+@@ -437,6 +447,7 @@ static struct dentry *yaffs_lookup(struc
}
@@ -41,7 +41,7 @@
/* For now put inode is just for debugging
* Put inode is called when the inode **structure** is put.
*/
-@@ -447,6 +458,7 @@
+@@ -447,6 +458,7 @@ static void yaffs_put_inode(struct inode
atomic_read(&inode->i_count)));
}
@@ -49,7 +49,7 @@
/* clear is called to tell the fs to release any per-inode data it holds */
static void yaffs_clear_inode(struct inode *inode)
-@@ -2279,7 +2291,7 @@
+@@ -2279,7 +2291,7 @@ static int __init init_yaffs_fs(void)
/* Install the proc_fs entry */
my_proc_entry = create_proc_entry("yaffs",
S_IRUGO | S_IFREG,
@@ -58,7 +58,7 @@
if (my_proc_entry) {
my_proc_entry->write_proc = yaffs_proc_write;
-@@ -2325,7 +2337,7 @@
+@@ -2325,7 +2337,7 @@ static void __exit exit_yaffs_fs(void)
T(YAFFS_TRACE_ALWAYS, ("yaffs " __DATE__ " " __TIME__
" removing. \n"));
diff --git a/target/linux/generic-2.6/patches-2.6.27/600-phy_extension.patch b/target/linux/generic-2.6/patches-2.6.27/600-phy_extension.patch
index 39f22bbdef..cacb7483ae 100644
--- a/target/linux/generic-2.6/patches-2.6.27/600-phy_extension.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/600-phy_extension.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
-@@ -348,6 +348,50 @@
+@@ -348,6 +348,50 @@ int phy_ethtool_gset(struct phy_device *
}
EXPORT_SYMBOL(phy_ethtool_gset);
@@ -51,7 +51,7 @@
/**
* phy_mii_ioctl - generic PHY MII ioctl interface
* @phydev: the phy_device struct
-@@ -403,8 +447,8 @@
+@@ -403,8 +447,8 @@ int phy_mii_ioctl(struct phy_device *phy
}
phy_write(phydev, mii_data->reg_num, val);
@@ -62,7 +62,7 @@
&& val & BMCR_RESET
&& phydev->drv->config_init) {
phy_scan_fixups(phydev);
-@@ -524,7 +568,7 @@
+@@ -524,7 +568,7 @@ static void phy_force_reduction(struct p
int idx;
idx = phy_find_setting(phydev->speed, phydev->duplex);
@@ -73,7 +73,7 @@
idx = phy_find_valid(idx, phydev->supported);
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
-@@ -434,6 +434,7 @@
+@@ -434,6 +434,7 @@ void phy_start_machine(struct phy_device
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);
diff --git a/target/linux/generic-2.6/patches-2.6.27/610-phy_detect.patch b/target/linux/generic-2.6/patches-2.6.27/610-phy_detect.patch
index 5cc9cd2895..fb46bce6ea 100644
--- a/target/linux/generic-2.6/patches-2.6.27/610-phy_detect.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/610-phy_detect.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
-@@ -135,6 +135,9 @@
+@@ -135,6 +135,9 @@ static int mdio_bus_match(struct device
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
-@@ -339,6 +339,11 @@
+@@ -339,6 +339,11 @@ struct phy_driver {
u32 features;
u32 flags;
diff --git a/target/linux/generic-2.6/patches-2.6.27/620-phy_adm6996.patch b/target/linux/generic-2.6/patches-2.6.27/620-phy_adm6996.patch
index 239384315e..7c98a0f51f 100644
--- a/target/linux/generic-2.6/patches-2.6.27/620-phy_adm6996.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/620-phy_adm6996.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -66,6 +66,11 @@
+@@ -66,6 +66,11 @@ config REALTEK_PHY
---help---
Supports the Realtek 821x PHY.
@@ -14,7 +14,7 @@
depends on PHYLIB=y
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
-@@ -12,6 +12,7 @@
+@@ -12,6 +12,7 @@ obj-$(CONFIG_SMSC_PHY) += smsc.o
obj-$(CONFIG_VITESSE_PHY) += vitesse.o
obj-$(CONFIG_BROADCOM_PHY) += broadcom.o
obj-$(CONFIG_ICPLUS_PHY) += icplus.o
diff --git a/target/linux/generic-2.6/patches-2.6.27/630-phy_packets.patch b/target/linux/generic-2.6/patches-2.6.27/630-phy_packets.patch
index f1c1580e0d..4fe1357913 100644
--- a/target/linux/generic-2.6/patches-2.6.27/630-phy_packets.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/630-phy_packets.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
-@@ -143,6 +143,18 @@
+@@ -143,6 +143,18 @@ int phy_scan_fixups(struct phy_device *p
}
EXPORT_SYMBOL(phy_scan_fixups);
@@ -19,7 +19,7 @@
struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id)
{
struct phy_device *dev;
-@@ -168,6 +180,8 @@
+@@ -168,6 +180,8 @@ struct phy_device* phy_device_create(str
dev->bus = bus;
dev->state = PHY_DOWN;
@@ -30,7 +30,7 @@
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
-@@ -309,6 +309,17 @@
+@@ -309,6 +309,17 @@ struct phy_device {
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
-@@ -613,6 +613,7 @@
+@@ -613,6 +613,7 @@ struct net_device
void *ax25_ptr; /* AX.25 specific data */
struct wireless_dev *ieee80211_ptr; /* IEEE 802.11 specific data,
assign before registering */
diff --git a/target/linux/generic-2.6/patches-2.6.27/640-mvswitch.patch b/target/linux/generic-2.6/patches-2.6.27/640-mvswitch.patch
index 74ea255e39..1810be9a3d 100644
--- a/target/linux/generic-2.6/patches-2.6.27/640-mvswitch.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/640-mvswitch.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -71,6 +71,12 @@
+@@ -71,6 +71,12 @@ config ADM6996_PHY
---help---
Currently supports the ADM6996F switch
@@ -15,7 +15,7 @@
depends on PHYLIB=y
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
-@@ -13,6 +13,7 @@
+@@ -13,6 +13,7 @@ obj-$(CONFIG_VITESSE_PHY) += vitesse.o
obj-$(CONFIG_BROADCOM_PHY) += broadcom.o
obj-$(CONFIG_ICPLUS_PHY) += icplus.o
obj-$(CONFIG_ADM6996_PHY) += adm6996.o
@@ -38,7 +38,7 @@
/**
* mdiobus_register - bring up all the PHYs on a given bus and attach them to bus
* @bus: target mii_bus
-@@ -85,6 +91,7 @@
+@@ -85,6 +91,7 @@ int mdiobus_register(struct mii_bus *bus
phydev->dev.parent = bus->dev;
phydev->dev.bus = &mdio_bus_type;
diff --git a/target/linux/generic-2.6/patches-2.6.27/801-usb_serial_endpoint_size.patch b/target/linux/generic-2.6/patches-2.6.27/801-usb_serial_endpoint_size.patch
index ec1d87aea8..e96e01cd55 100644
--- a/target/linux/generic-2.6/patches-2.6.27/801-usb_serial_endpoint_size.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/801-usb_serial_endpoint_size.patch
@@ -1,6 +1,6 @@
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
-@@ -59,6 +59,7 @@
+@@ -59,6 +59,7 @@ static struct usb_driver usb_serial_driv
drivers depend on it.
*/
@@ -8,7 +8,7 @@
static int debug;
/* initially all NULL */
static struct usb_serial *serial_table[SERIAL_TTY_MINORS];
-@@ -835,7 +836,7 @@
+@@ -835,7 +836,7 @@ int usb_serial_probe(struct usb_interfac
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);
-@@ -1255,3 +1256,5 @@
+@@ -1255,3 +1256,5 @@ MODULE_LICENSE("GPL");
module_param(debug, bool, S_IRUGO | S_IWUSR);
MODULE_PARM_DESC(debug, "Debug enabled or not");
diff --git a/target/linux/generic-2.6/patches-2.6.27/840-unable_to_open_console.patch b/target/linux/generic-2.6/patches-2.6.27/840-unable_to_open_console.patch
index c31f68fbda..b109b0e7c3 100644
--- a/target/linux/generic-2.6/patches-2.6.27/840-unable_to_open_console.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/840-unable_to_open_console.patch
@@ -1,6 +1,6 @@
--- a/init/main.c
+++ b/init/main.c
-@@ -801,7 +801,7 @@
+@@ -801,7 +801,7 @@ static int noinline init_post(void)
numa_default_policy();
if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
diff --git a/target/linux/generic-2.6/patches-2.6.27/900-headers_type_and_time.patch b/target/linux/generic-2.6/patches-2.6.27/900-headers_type_and_time.patch
index b318c90606..b12387280a 100644
--- a/target/linux/generic-2.6/patches-2.6.27/900-headers_type_and_time.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/900-headers_type_and_time.patch
@@ -11,7 +11,7 @@
#include <linux/types.h>
#ifdef __KERNEL__
-@@ -228,4 +232,6 @@
+@@ -228,4 +232,6 @@ struct itimerval {
*/
#define TIMER_ABSTIME 0x01
@@ -35,7 +35,7 @@
#ifdef __KERNEL__
#define DECLARE_BITMAP(name,bits) \
-@@ -161,6 +169,8 @@
+@@ -161,6 +169,8 @@ typedef unsigned long blkcnt_t;
#endif /* __KERNEL_STRICT_NAMES */
diff --git a/target/linux/generic-2.6/patches-2.6.27/902-darwin_scripts_include.patch b/target/linux/generic-2.6/patches-2.6.27/902-darwin_scripts_include.patch
index 5d454b8e01..96fffc0660 100644
--- a/target/linux/generic-2.6/patches-2.6.27/902-darwin_scripts_include.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/902-darwin_scripts_include.patch
@@ -62,7 +62,7 @@
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
-@@ -93,6 +93,9 @@
+@@ -93,6 +93,9 @@ check-lxdialog := $(srctree)/$(src)/lxd
# we really need to do so. (Do not call gcc as part of make mrproper)
HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
HOST_LOADLIBES = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
diff --git a/target/linux/generic-2.6/patches-2.6.27/903-hostap_txpower.patch b/target/linux/generic-2.6/patches-2.6.27/903-hostap_txpower.patch
index 581014fad6..6b4fc9f238 100644
--- a/target/linux/generic-2.6/patches-2.6.27/903-hostap_txpower.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/903-hostap_txpower.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/hostap/hostap_ap.c
+++ b/drivers/net/wireless/hostap/hostap_ap.c
-@@ -2397,13 +2397,13 @@
+@@ -2397,13 +2397,13 @@ int prism2_ap_get_sta_qual(local_info_t
addr[count].sa_family = ARPHRD_ETHER;
memcpy(addr[count].sa_data, sta->addr, ETH_ALEN);
if (sta->last_rx_silence == 0)
@@ -20,7 +20,7 @@
qual[count].updated = sta->last_rx_updated;
sta->last_rx_updated = IW_QUAL_DBM;
-@@ -2469,13 +2469,13 @@
+@@ -2469,13 +2469,13 @@ int prism2_ap_translate_scan(struct net_
memset(&iwe, 0, sizeof(iwe));
iwe.cmd = IWEVQUAL;
if (sta->last_rx_silence == 0)
@@ -54,7 +54,7 @@
#endif /* HOSTAP_CONFIG_H */
--- a/drivers/net/wireless/hostap/hostap.h
+++ b/drivers/net/wireless/hostap/hostap.h
-@@ -90,6 +90,7 @@
+@@ -90,6 +90,7 @@ extern const struct iw_handler_def hosta
extern const struct ethtool_ops prism2_ethtool_ops;
int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
@@ -64,7 +64,7 @@
#endif /* HOSTAP_H */
--- a/drivers/net/wireless/hostap/hostap_hw.c
+++ b/drivers/net/wireless/hostap/hostap_hw.c
-@@ -933,6 +933,7 @@
+@@ -933,6 +933,7 @@ static int hfa384x_set_rid(struct net_de
prism2_hw_reset(dev);
}
@@ -74,7 +74,7 @@
--- a/drivers/net/wireless/hostap/hostap_info.c
+++ b/drivers/net/wireless/hostap/hostap_info.c
-@@ -434,6 +434,11 @@
+@@ -434,6 +434,11 @@ static void handle_info_queue_linkstatus
}
/* Get BSSID if we have a valid AP address */
@@ -88,7 +88,7 @@
netif_carrier_on(local->ddev);
--- a/drivers/net/wireless/hostap/hostap_ioctl.c
+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
-@@ -1502,23 +1502,20 @@
+@@ -1502,23 +1502,20 @@ static int prism2_txpower_hfa386x_to_dBm
val = 255;
tmp = val;
@@ -116,7 +116,7 @@
return (unsigned char) tmp;
}
-@@ -4083,3 +4080,35 @@
+@@ -4083,3 +4080,35 @@ int hostap_ioctl(struct net_device *dev,
return ret;
}
diff --git a/target/linux/generic-2.6/patches-2.6.27/903-stddef_include.patch b/target/linux/generic-2.6/patches-2.6.27/903-stddef_include.patch
index c0c01c0101..7fe248d8d3 100644
--- a/target/linux/generic-2.6/patches-2.6.27/903-stddef_include.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/903-stddef_include.patch
@@ -1,6 +1,6 @@
--- a/include/linux/stddef.h
+++ b/include/linux/stddef.h
-@@ -16,6 +16,7 @@
+@@ -16,6 +16,7 @@ enum {
false = 0,
true = 1
};
@@ -8,7 +8,7 @@
#undef offsetof
#ifdef __compiler_offsetof
-@@ -23,6 +24,5 @@
+@@ -23,6 +24,5 @@ enum {
#else
#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
#endif
diff --git a/target/linux/generic-2.6/patches-2.6.27/921-gpio_spi_driver.patch b/target/linux/generic-2.6/patches-2.6.27/921-gpio_spi_driver.patch
index 6be8e26d7d..590a2230fa 100644
--- a/target/linux/generic-2.6/patches-2.6.27/921-gpio_spi_driver.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/921-gpio_spi_driver.patch
@@ -330,7 +330,7 @@
+MODULE_LICENSE("GPL v2");
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
-@@ -100,6 +100,19 @@
+@@ -100,6 +100,19 @@ config SPI_BUTTERFLY
inexpensive battery powered microcontroller evaluation board.
This same cable can be used to flash new firmware.
@@ -352,7 +352,7 @@
depends on ARCH_IMX && EXPERIMENTAL
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
-@@ -16,6 +16,7 @@
+@@ -16,6 +16,7 @@ obj-$(CONFIG_SPI_BFIN) += spi_bfin5xx.
obj-$(CONFIG_SPI_BITBANG) += spi_bitbang.o
obj-$(CONFIG_SPI_AU1550) += au1550_spi.o
obj-$(CONFIG_SPI_BUTTERFLY) += spi_butterfly.o
@@ -362,7 +362,7 @@
obj-$(CONFIG_SPI_PXA2XX) += pxa2xx_spi.o
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -3854,6 +3854,11 @@
+@@ -3854,6 +3854,11 @@ L: cbe-oss-dev@ozlabs.org
W: http://www.ibm.com/developerworks/power/cell/
S: Supported
diff --git a/target/linux/generic-2.6/patches-2.6.27/922-gpiommc.patch b/target/linux/generic-2.6/patches-2.6.27/922-gpiommc.patch
index 4fd9dd13e6..d4bb0537f5 100644
--- a/target/linux/generic-2.6/patches-2.6.27/922-gpiommc.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/922-gpiommc.patch
@@ -611,7 +611,7 @@
+module_exit(gpiommc_modexit);
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
-@@ -180,3 +180,28 @@
+@@ -180,3 +180,28 @@ config MMC_TMIO
help
This provides support for the SD/MMC cell found in TC6393XB,
T7L66XB and also ipaq ASIC3
@@ -642,7 +642,7 @@
+ if configfs is available.
--- a/drivers/mmc/host/Makefile
+++ b/drivers/mmc/host/Makefile
-@@ -22,4 +22,5 @@
+@@ -22,4 +22,5 @@ obj-$(CONFIG_MMC_SPI) += mmc_spi.o
obj-$(CONFIG_MMC_S3C) += s3cmci.o
obj-$(CONFIG_MMC_SDRICOH_CS) += sdricoh_cs.o
obj-$(CONFIG_MMC_TMIO) += tmio_mmc.o
@@ -824,7 +824,7 @@
+be done automatically.
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -1833,6 +1833,11 @@
+@@ -1833,6 +1833,11 @@ L: gigaset307x-common@lists.sourceforge.
W: http://gigaset307x.sourceforge.net/
S: Maintained
diff --git a/target/linux/generic-2.6/patches-2.6.27/923-gpiommc-configfs-locking.patch b/target/linux/generic-2.6/patches-2.6.27/923-gpiommc-configfs-locking.patch
index 1d0f5ba651..2e4e820b2b 100644
--- a/target/linux/generic-2.6/patches-2.6.27/923-gpiommc-configfs-locking.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/923-gpiommc-configfs-locking.patch
@@ -3,7 +3,7 @@ does not lock access between files.
--- a/drivers/mmc/host/gpiommc.c
+++ b/drivers/mmc/host/gpiommc.c
-@@ -143,6 +143,8 @@
+@@ -143,6 +143,8 @@ struct gpiommc_configfs_device {
struct platform_device *pdev;
/* The configuration */
struct gpiommc_platform_data pdata;
@@ -12,7 +12,7 @@ does not lock access between files.
};
#define GPIO_INVALID -1
-@@ -233,6 +235,8 @@
+@@ -233,6 +235,8 @@ static ssize_t gpiommc_config_attr_show(
unsigned int gpio;
int err = 0;
@@ -21,7 +21,7 @@ does not lock access between files.
if (attr == &gpiommc_attr_DI) {
gpio = dev->pdata.pins.gpio_di;
if (gpio == GPIO_INVALID)
-@@ -293,6 +297,8 @@
+@@ -293,6 +297,8 @@ static ssize_t gpiommc_config_attr_show(
WARN_ON(1);
err = -ENOSYS;
out:
@@ -30,7 +30,7 @@ does not lock access between files.
return err ? err : count;
}
-@@ -352,6 +358,8 @@
+@@ -352,6 +358,8 @@ static ssize_t gpiommc_config_attr_store
int err = -EINVAL;
unsigned long data;
@@ -39,7 +39,7 @@ does not lock access between files.
if (attr == &gpiommc_attr_register) {
err = strict_strtoul(page, 10, &data);
if (err)
-@@ -477,6 +485,8 @@
+@@ -477,6 +485,8 @@ static ssize_t gpiommc_config_attr_store
WARN_ON(1);
err = -ENOSYS;
out:
@@ -48,7 +48,7 @@ does not lock access between files.
return err ? err : count;
}
-@@ -513,6 +523,7 @@
+@@ -513,6 +523,7 @@ static struct config_item *gpiommc_make_
if (!dev)
return NULL;
diff --git a/target/linux/generic-2.6/patches-2.6.27/950-revert_xt_sctp_simplify.patch b/target/linux/generic-2.6/patches-2.6.27/950-revert_xt_sctp_simplify.patch
index a4d9381b59..462147b6db 100644
--- a/target/linux/generic-2.6/patches-2.6.27/950-revert_xt_sctp_simplify.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/950-revert_xt_sctp_simplify.patch
@@ -1,6 +1,6 @@
--- a/include/linux/netfilter/xt_sctp.h
+++ b/include/linux/netfilter/xt_sctp.h
-@@ -37,54 +37,68 @@
+@@ -37,54 +37,68 @@ struct xt_sctp_info {
#define SCTP_CHUNKMAP_SET(chunkmap, type) \
do { \
diff --git a/target/linux/generic-2.6/patches-2.6.27/951-revert_gcc4_4_fixes.patch b/target/linux/generic-2.6/patches-2.6.27/951-revert_gcc4_4_fixes.patch
index 271f01de12..1f1800f23a 100644
--- a/target/linux/generic-2.6/patches-2.6.27/951-revert_gcc4_4_fixes.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/951-revert_gcc4_4_fixes.patch
@@ -236,7 +236,7 @@
-#endif
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
-@@ -53,7 +53,7 @@
+@@ -53,7 +53,7 @@ $(addprefix $(obj)/,$(zlib) cuboot-c2k.o
$(addprefix $(obj)/,$(zliblinuxheader)) $(addprefix $(obj)/,$(zlibheader))
src-libfdt := fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c
@@ -247,7 +247,7 @@
gunzip_util.c elf_util.c $(zlib) devtree.c oflib.c ofconsole.c \
--- a/arch/powerpc/kernel/prom_init_check.sh
+++ b/arch/powerpc/kernel/prom_init_check.sh
-@@ -48,20 +48,6 @@
+@@ -48,20 +48,6 @@ do
fi
done
@@ -502,7 +502,7 @@
-#endif
--- a/arch/powerpc/lib/Makefile
+++ b/arch/powerpc/lib/Makefile
-@@ -8,7 +8,7 @@
+@@ -8,7 +8,7 @@ endif
obj-y := string.o alloc.o \
checksum_$(CONFIG_WORD_SIZE).o
@@ -513,7 +513,7 @@
obj-$(CONFIG_PPC64) += copypage_64.o copyuser_64.o \
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
-@@ -90,8 +90,6 @@
+@@ -90,8 +90,6 @@ endif
else
KBUILD_CFLAGS += $(call cc-option,-mtune=power4)
endif
diff --git a/target/linux/generic-2.6/patches-2.6.27/952-revert_xt_string_case_insensitive_match.patch b/target/linux/generic-2.6/patches-2.6.27/952-revert_xt_string_case_insensitive_match.patch
index 4902db1585..6f317e4667 100644
--- a/target/linux/generic-2.6/patches-2.6.27/952-revert_xt_string_case_insensitive_match.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/952-revert_xt_string_case_insensitive_match.patch
@@ -12,7 +12,7 @@
struct xt_string_info
{
u_int16_t from_offset;
-@@ -16,15 +11,7 @@
+@@ -16,15 +11,7 @@ struct xt_string_info
char algo[XT_STRING_MAX_ALGO_NAME_SIZE];
char pattern[XT_STRING_MAX_PATTERN_SIZE];
u_int8_t patlen;
@@ -31,7 +31,7 @@
struct ts_config __attribute__((aligned(8))) *config;
--- a/net/netfilter/xt_string.c
+++ b/net/netfilter/xt_string.c
-@@ -29,16 +29,12 @@
+@@ -29,16 +29,12 @@ string_mt(const struct sk_buff *skb, con
{
const struct xt_string_info *conf = matchinfo;
struct ts_state state;
@@ -49,7 +49,7 @@
}
#define STRING_TEXT_PRIV(m) ((struct xt_string_info *)(m))
-@@ -50,7 +46,6 @@
+@@ -50,7 +46,6 @@ string_mt_check(const char *tablename, c
{
struct xt_string_info *conf = matchinfo;
struct ts_config *ts_conf;
@@ -57,7 +57,7 @@
/* Damn, can't handle this case properly with iptables... */
if (conf->from_offset > conf->to_offset)
-@@ -59,15 +54,8 @@
+@@ -59,15 +54,8 @@ string_mt_check(const char *tablename, c
return false;
if (conf->patlen > XT_STRING_MAX_PATTERN_SIZE)
return false;
@@ -74,7 +74,7 @@
if (IS_ERR(ts_conf))
return false;
-@@ -84,17 +72,6 @@
+@@ -84,17 +72,6 @@ static void string_mt_destroy(const stru
static struct xt_match string_mt_reg[] __read_mostly = {
{
.name = "string",
@@ -92,7 +92,7 @@
.family = AF_INET,
.checkentry = string_mt_check,
.match = string_mt,
-@@ -104,17 +81,6 @@
+@@ -104,17 +81,6 @@ static struct xt_match string_mt_reg[] _
},
{
.name = "string",
diff --git a/target/linux/generic-2.6/patches-2.6.27/970-ocf_20080704.patch b/target/linux/generic-2.6/patches-2.6.27/970-ocf_20080704.patch
index f8b0b49a35..f876a78968 100644
--- a/target/linux/generic-2.6/patches-2.6.27/970-ocf_20080704.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/970-ocf_20080704.patch
@@ -1,6 +1,6 @@
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
-@@ -669,3 +669,6 @@
+@@ -669,3 +669,6 @@ config CRYPTO_LZO
source "drivers/crypto/Kconfig"
endif # if CRYPTO
@@ -9,7 +9,7 @@
+
--- a/crypto/Makefile
+++ b/crypto/Makefile
-@@ -72,6 +72,8 @@
+@@ -72,6 +72,8 @@ obj-$(CONFIG_CRYPTO_LZO) += lzo.o
obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o
@@ -44,7 +44,7 @@
* All of these routines try to estimate how many bits of randomness a
* particular randomness source. They do this by keeping track of the
* first and second order deltas of the event timings.
-@@ -668,6 +678,61 @@
+@@ -668,6 +678,61 @@ void add_disk_randomness(struct gendisk
}
#endif
@@ -108,7 +108,7 @@
/*********************************************************************
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
-@@ -139,6 +139,7 @@
+@@ -139,6 +139,7 @@ asmlinkage long sys_dup(unsigned int fil
}
return ret;
}
@@ -167,7 +167,7 @@
struct rand_pool_info {
int entropy_count;
int buf_size;
-@@ -48,6 +73,10 @@
+@@ -48,6 +73,10 @@ extern void add_input_randomness(unsigne
unsigned int value);
extern void add_interrupt_randomness(int irq);