projects
/
openwrt
/
svn-archive
/
archive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0d21fe8
)
kernel: update to kernel version 2.6.32.32
author
Hauke Mehrtens
<hauke@hauke-m.de>
Sun, 13 Mar 2011 17:12:20 +0000
(17:12 +0000)
committer
Hauke Mehrtens
<hauke@hauke-m.de>
Sun, 13 Mar 2011 17:12:20 +0000
(17:12 +0000)
SVN-Revision: 26124
31 files changed:
include/kernel-version.mk
patch
|
blob
|
history
target/linux/adm5120/Makefile
patch
|
blob
|
history
target/linux/cobalt/Makefile
patch
|
blob
|
history
target/linux/etrax/Makefile
patch
|
blob
|
history
target/linux/generic/patches-2.6.32/014-cfi_fix_amd_extended_table_check.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.32/020-mips_multi_machine_support.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.32/040-arm-update-mach-types.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.32/100-netfilter_layer7_2.21.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.32/110-netfilter_match_speedup.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.32/202-mips_mem_functions_performance.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.32/203-slab_maxsize.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.32/210-mini_fo_2.6.25_fixes.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.32/212-mini_fo_2.6.26_fixes.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.32/223-kobject-add-broadcast_uevent.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.32/400-ledtrig_morse.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.32/402-ledtrig_netdev.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.32/511-yaffs-cvs-2009-04-24.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.32/903-hostap_txpower.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.32/930-kmsg_dump_backport.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.32/971-ocf_20100325.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.32/975-ssb_update.patch
patch
|
blob
|
history
target/linux/generic/patches-2.6.32/998-openwrt_lzma_options.patch
patch
|
blob
|
history
target/linux/iop32x/Makefile
patch
|
blob
|
history
target/linux/omap35xx/Makefile
patch
|
blob
|
history
target/linux/ppc40x/Makefile
patch
|
blob
|
history
target/linux/ppc44x/Makefile
patch
|
blob
|
history
target/linux/pxa/Makefile
patch
|
blob
|
history
target/linux/rb532/Makefile
patch
|
blob
|
history
target/linux/rdc/Makefile
patch
|
blob
|
history
target/linux/sibyte/Makefile
patch
|
blob
|
history
target/linux/x86/Makefile
patch
|
blob
|
history
diff --git
a/include/kernel-version.mk
b/include/kernel-version.mk
index 3055a9f0faac727bb81bd0aa83d9cd0c429da00e..f67277dedaafe780b6138d6a713b92afd9b912e7 100644
(file)
--- a/
include/kernel-version.mk
+++ b/
include/kernel-version.mk
@@
-8,8
+8,8
@@
endif
ifeq ($(LINUX_VERSION),2.6.31.14)
LINUX_KERNEL_MD5SUM:=3e7feb224197d8e174a90dd3759979fd
endif
ifeq ($(LINUX_VERSION),2.6.31.14)
LINUX_KERNEL_MD5SUM:=3e7feb224197d8e174a90dd3759979fd
endif
-ifeq ($(LINUX_VERSION),2.6.32.
29
)
- LINUX_KERNEL_MD5SUM:=
0eea644c2cef06b4ec170228866b9685
+ifeq ($(LINUX_VERSION),2.6.32.
32
)
+ LINUX_KERNEL_MD5SUM:=
25a3ba004aaaa409c24dfb2cc268d03e
endif
ifeq ($(LINUX_VERSION),2.6.34.7)
LINUX_KERNEL_MD5SUM:=8964e26120e84844998a673464a980ea
endif
ifeq ($(LINUX_VERSION),2.6.34.7)
LINUX_KERNEL_MD5SUM:=8964e26120e84844998a673464a980ea
diff --git
a/target/linux/adm5120/Makefile
b/target/linux/adm5120/Makefile
index 1fc4081c7cb493c76f13e0d6ffa028510274be1a..386e17010f830285b1726e427a2d4320b55b9b4b 100644
(file)
--- a/
target/linux/adm5120/Makefile
+++ b/
target/linux/adm5120/Makefile
@@
-9,7
+9,7
@@
include $(TOPDIR)/rules.mk
BOARD:=adm5120
BOARDNAME:=Infineon/ADMtek ADM5120
BOARD:=adm5120
BOARDNAME:=Infineon/ADMtek ADM5120
-LINUX_VERSION:=2.6.32.
29
+LINUX_VERSION:=2.6.32.
32
SUBTARGETS:=router_le router_be
INITRAMFS_EXTRA_FILES:=
SUBTARGETS:=router_le router_be
INITRAMFS_EXTRA_FILES:=
diff --git
a/target/linux/cobalt/Makefile
b/target/linux/cobalt/Makefile
index 35167e182123fa7bfec6d715b87cd754337150f5..9221476dab6f28a059ca88e6df17e0932fccea3c 100644
(file)
--- a/
target/linux/cobalt/Makefile
+++ b/
target/linux/cobalt/Makefile
@@
-12,7
+12,7
@@
BOARDNAME:=Cobalt Microservers
FEATURES:=targz pci ext4
CFLAGS:=-O2 -pipe -mtune=r5000 -funit-at-a-time
FEATURES:=targz pci ext4
CFLAGS:=-O2 -pipe -mtune=r5000 -funit-at-a-time
-LINUX_VERSION:=2.6.32.
29
+LINUX_VERSION:=2.6.32.
32
include $(INCLUDE_DIR)/target.mk
include $(INCLUDE_DIR)/target.mk
diff --git
a/target/linux/etrax/Makefile
b/target/linux/etrax/Makefile
index cfe49536b5675708b6b912b031547b7740b62486..469d23e8bb6fa70f8aaae036bd75a912489b9ff3 100644
(file)
--- a/
target/linux/etrax/Makefile
+++ b/
target/linux/etrax/Makefile
@@
-11,7
+11,7
@@
BOARD:=etrax
MAINTAINER:=Claudio Mignanti <c.mignanti@gmail.com>
BOARDNAME:=Axis ETRAX 100LX
FEATURES:=squashfs jffs2 usb
MAINTAINER:=Claudio Mignanti <c.mignanti@gmail.com>
BOARDNAME:=Axis ETRAX 100LX
FEATURES:=squashfs jffs2 usb
-LINUX_VERSION:=2.6.32.
29
+LINUX_VERSION:=2.6.32.
32
DEVICE_TYPE=
include $(INCLUDE_DIR)/target.mk
DEVICE_TYPE=
include $(INCLUDE_DIR)/target.mk
diff --git
a/target/linux/generic/patches-2.6.32/014-cfi_fix_amd_extended_table_check.patch
b/target/linux/generic/patches-2.6.32/014-cfi_fix_amd_extended_table_check.patch
index 7010d367b8f25449a593d19fbbe4e69f543ecc2c..2618fafeb99abea83e2c607d0ca12f6444670fcb 100644
(file)
--- a/
target/linux/generic/patches-2.6.32/014-cfi_fix_amd_extended_table_check.patch
+++ b/
target/linux/generic/patches-2.6.32/014-cfi_fix_amd_extended_table_check.patch
@@
-1,6
+1,6
@@
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -325,6 +325,8 @@ static struct cfi_fixup fixup_table[] =
+@@ -325,6 +325,8 @@ static struct cfi_fixup fixup_table[] =
static void cfi_fixup_major_minor(struct cfi_private *cfi,
struct cfi_pri_amdstd *extp)
{
static void cfi_fixup_major_minor(struct cfi_private *cfi,
struct cfi_pri_amdstd *extp)
{
@@
-9,7
+9,7
@@
if (cfi->mfr == CFI_MFR_SAMSUNG && cfi->id == 0x257e &&
extp->MajorVersion == '0')
extp->MajorVersion = '1';
if (cfi->mfr == CFI_MFR_SAMSUNG && cfi->id == 0x257e &&
extp->MajorVersion == '0')
extp->MajorVersion = '1';
-@@ -355,6 +357,9 @@ struct mtd_info *cfi_cmdset_0002(struct
+@@ -355,6 +357,9 @@ struct mtd_info *cfi_cmdset_0002(struct
mtd->name = map->name;
mtd->writesize = 1;
mtd->name = map->name;
mtd->writesize = 1;
@@
-19,7
+19,7
@@
if (cfi->cfi_mode==CFI_MODE_CFI){
unsigned char bootloc;
/*
if (cfi->cfi_mode==CFI_MODE_CFI){
unsigned char bootloc;
/*
-@@ -373,16 +378,24 @@ struct mtd_info *cfi_cmdset_0002(struct
+@@ -373,16 +378,24 @@ struct mtd_info *cfi_cmdset_0002(struct
cfi_fixup_major_minor(cfi, extp);
cfi_fixup_major_minor(cfi, extp);
diff --git
a/target/linux/generic/patches-2.6.32/020-mips_multi_machine_support.patch
b/target/linux/generic/patches-2.6.32/020-mips_multi_machine_support.patch
index d73b2d1523c4dc060f9bac44fbd644537ccf1b89..d53c0c85fc826814fbc768180da787e767f2dc2c 100644
(file)
--- a/
target/linux/generic/patches-2.6.32/020-mips_multi_machine_support.patch
+++ b/
target/linux/generic/patches-2.6.32/020-mips_multi_machine_support.patch
@@
-176,7
+176,7
@@
unsigned int vced_count, vcei_count;
unsigned int vced_count, vcei_count;
-@@ -31,8 +32,12 @@ static int show_cpuinfo(struct seq_file
+@@ -31,8 +32,12 @@ static int show_cpuinfo(struct seq_file
/*
* For the first processor also print the system type
*/
/*
* For the first processor also print the system type
*/
diff --git
a/target/linux/generic/patches-2.6.32/040-arm-update-mach-types.patch
b/target/linux/generic/patches-2.6.32/040-arm-update-mach-types.patch
index dba3b32d807f04b0e184e5e0b9fd5e17261ad340..9880ff0141ae9e7146644751b5bfb6f2ebc6e7d6 100644
(file)
--- a/
target/linux/generic/patches-2.6.32/040-arm-update-mach-types.patch
+++ b/
target/linux/generic/patches-2.6.32/040-arm-update-mach-types.patch
@@
-55,7
+55,7
@@
vesper MACH_VESPER VESPER 2256
str9 MACH_STR9 STR9 2257
omap3_wl_ff MACH_OMAP3_WL_FF OMAP3_WL_FF 2258
vesper MACH_VESPER VESPER 2256
str9 MACH_STR9 STR9 2257
omap3_wl_ff MACH_OMAP3_WL_FF OMAP3_WL_FF 2258
-@@ -2256,7 +2257,7 @@ oratisalog MACH_ORATISALOG ORATISALOG
+@@ -2256,7 +2257,7 @@ oratisalog MACH_ORATISALOG ORATISALOG
oratismadi MACH_ORATISMADI ORATISMADI 2269
oratisot16 MACH_ORATISOT16 ORATISOT16 2270
oratisdesk MACH_ORATISDESK ORATISDESK 2271
oratismadi MACH_ORATISMADI ORATISMADI 2269
oratisot16 MACH_ORATISOT16 ORATISOT16 2270
oratisdesk MACH_ORATISDESK ORATISDESK 2271
@@
-100,7
+100,7
@@
htc_excalibur_s620 MACH_HTC_EXCALIBUR_S620 HTC_EXCALIBUR_S620 2391
htc_opal MACH_HTC_OPAL HTC_OPAL 2392
touchbook MACH_TOUCHBOOK TOUCHBOOK 2393
htc_excalibur_s620 MACH_HTC_EXCALIBUR_S620 HTC_EXCALIBUR_S620 2391
htc_opal MACH_HTC_OPAL HTC_OPAL 2392
touchbook MACH_TOUCHBOOK TOUCHBOOK 2393
-@@ -2445,7 +2446,7 @@ siogentoo1 MACH_SIOGENTOO1 SIOGENTOO1
+@@ -2445,7 +2446,7 @@ siogentoo1 MACH_SIOGENTOO1 SIOGENTOO1
siogentoo2 MACH_SIOGENTOO2 SIOGENTOO2 2459
sm3k MACH_SM3K SM3K 2460
acer_tempo_f900 MACH_ACER_TEMPO_F900 ACER_TEMPO_F900 2461
siogentoo2 MACH_SIOGENTOO2 SIOGENTOO2 2459
sm3k MACH_SM3K SM3K 2460
acer_tempo_f900 MACH_ACER_TEMPO_F900 ACER_TEMPO_F900 2461
diff --git
a/target/linux/generic/patches-2.6.32/100-netfilter_layer7_2.21.patch
b/target/linux/generic/patches-2.6.32/100-netfilter_layer7_2.21.patch
index be7d97fe1203646d5082b42bd10ec9394d19b6a0..de9c63c357abafaea08a9faaf4e825c76314a722 100644
(file)
--- a/
target/linux/generic/patches-2.6.32/100-netfilter_layer7_2.21.patch
+++ b/
target/linux/generic/patches-2.6.32/100-netfilter_layer7_2.21.patch
@@
-71,7
+71,7
@@
depends on NETFILTER_ADVANCED
--- a/net/netfilter/Makefile
+++ b/net/netfilter/Makefile
depends on NETFILTER_ADVANCED
--- a/net/netfilter/Makefile
+++ b/net/netfilter/Makefile
-@@ -89,6 +89,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT)
+@@ -89,6 +89,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT)
obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) += xt_socket.o
obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o
obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) += xt_socket.o
obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o
diff --git
a/target/linux/generic/patches-2.6.32/110-netfilter_match_speedup.patch
b/target/linux/generic/patches-2.6.32/110-netfilter_match_speedup.patch
index a9eb1089f5f206af1793b3897c123bf26bb1b00f..04ba7102740d210b3d01355792204da9e867f9e3 100644
(file)
--- a/
target/linux/generic/patches-2.6.32/110-netfilter_match_speedup.patch
+++ b/
target/linux/generic/patches-2.6.32/110-netfilter_match_speedup.patch
@@
-127,10
+127,11
@@
e = (struct ipt_entry *)(loc_cpu_entry + off);
if (copy_to_user(userptr + off
e = (struct ipt_entry *)(loc_cpu_entry + off);
if (copy_to_user(userptr + off
-@@ -1002,6 +1042,14 @@ copy_entries_to_user(unsigned int total_
+@@ -1001,6 +1041,14 @@ copy_entries_to_user(unsigned int total_
+ ret = -EFAULT;
goto free_counters;
}
goto free_counters;
}
-
++
+ flags = e->ip.flags & ~IPT_F_NO_DEF_MATCH;
+ if (copy_to_user(userptr + off
+ + offsetof(struct ipt_entry, ip.flags),
+ flags = e->ip.flags & ~IPT_F_NO_DEF_MATCH;
+ if (copy_to_user(userptr + off
+ + offsetof(struct ipt_entry, ip.flags),
@@
-138,7
+139,6
@@
+ ret = -EFAULT;
+ goto free_counters;
+ }
+ ret = -EFAULT;
+ goto free_counters;
+ }
-+
+
for (i = sizeof(struct ipt_entry);
i < e->target_offset;
for (i = sizeof(struct ipt_entry);
i < e->target_offset;
- i += m->u.match_size) {
diff --git
a/target/linux/generic/patches-2.6.32/202-mips_mem_functions_performance.patch
b/target/linux/generic/patches-2.6.32/202-mips_mem_functions_performance.patch
index 6ea9ba51ee0d24cf3a3ac657278109d9b11de859..e4324717b4459ce1f1009053e6317c930b01b6e4 100644
(file)
--- a/
target/linux/generic/patches-2.6.32/202-mips_mem_functions_performance.patch
+++ b/
target/linux/generic/patches-2.6.32/202-mips_mem_functions_performance.patch
@@
-1,6
+1,6
@@
--- a/arch/mips/include/asm/string.h
+++ b/arch/mips/include/asm/string.h
--- a/arch/mips/include/asm/string.h
+++ b/arch/mips/include/asm/string.h
-@@ -133,11 +133,44 @@ strncmp(__const__ char *__cs, __const__
+@@ -133,11 +133,44 @@ strncmp(__const__ char *__cs, __const__
#define __HAVE_ARCH_MEMSET
extern void *memset(void *__s, int __c, size_t __count);
#define __HAVE_ARCH_MEMSET
extern void *memset(void *__s, int __c, size_t __count);
diff --git
a/target/linux/generic/patches-2.6.32/203-slab_maxsize.patch
b/target/linux/generic/patches-2.6.32/203-slab_maxsize.patch
index 0c1ae72a4ebe435e684bcd198039d89090e0cd13..5bbf9f5f0ef1986190db569ca4bdb55d35ab55cd 100644
(file)
--- a/
target/linux/generic/patches-2.6.32/203-slab_maxsize.patch
+++ b/
target/linux/generic/patches-2.6.32/203-slab_maxsize.patch
@@
-1,6
+1,6
@@
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
-@@ -124,8 +124,8 @@ int kmem_ptr_validate(struct kmem_cache
+@@ -124,8 +124,8 @@ int kmem_ptr_validate(struct kmem_cache
* to do various tricks to work around compiler limitations in order to
* ensure proper constant folding.
*/
* to do various tricks to work around compiler limitations in order to
* ensure proper constant folding.
*/
diff --git
a/target/linux/generic/patches-2.6.32/210-mini_fo_2.6.25_fixes.patch
b/target/linux/generic/patches-2.6.32/210-mini_fo_2.6.25_fixes.patch
index d71e3b6faa6644c2337588f4b344cc5677419841..b64630d50045480d022ba26c901cea68f6da66b3 100644
(file)
--- a/
target/linux/generic/patches-2.6.32/210-mini_fo_2.6.25_fixes.patch
+++ b/
target/linux/generic/patches-2.6.32/210-mini_fo_2.6.25_fixes.patch
@@
-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);
#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 @@ static inline void double_unlock(struct
+@@ -501,6 +505,29 @@ static inline void double_unlock(struct
#endif /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */
#endif /* __KERNEL__ */
#endif /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */
#endif /* __KERNEL__ */
@@
-127,7
+127,7
@@
#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
--- a/fs/mini_fo/aux.c
+++ b/fs/mini_fo/aux.c
#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
--- a/fs/mini_fo/aux.c
+++ b/fs/mini_fo/aux.c
-@@ -164,11 +164,11 @@ dentry_t *bpath_walk(super_block_t *sb,
+@@ -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 */
err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd);
/* validate */
diff --git
a/target/linux/generic/patches-2.6.32/212-mini_fo_2.6.26_fixes.patch
b/target/linux/generic/patches-2.6.32/212-mini_fo_2.6.26_fixes.patch
index 8bd9ba32447e15df6ebc7153edfe89dfd38f43f6..b5fa64e6a19e7fff343aed59f4ddccfc34578d91 100644
(file)
--- a/
target/linux/generic/patches-2.6.32/212-mini_fo_2.6.26_fixes.patch
+++ b/
target/linux/generic/patches-2.6.32/212-mini_fo_2.6.26_fixes.patch
@@
-1,6
+1,6
@@
--- a/fs/mini_fo/super.c
+++ b/fs/mini_fo/super.c
--- a/fs/mini_fo/super.c
+++ b/fs/mini_fo/super.c
-@@ -84,6 +84,7 @@ mini_fo_write_inode(inode_t *inode, int
+@@ -84,6 +84,7 @@ mini_fo_write_inode(inode_t *inode, int
#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
diff --git
a/target/linux/generic/patches-2.6.32/223-kobject-add-broadcast_uevent.patch
b/target/linux/generic/patches-2.6.32/223-kobject-add-broadcast_uevent.patch
index 393668b8af4869ca98614508ee1a240b06ef91ff..cc4ffb25533285eda399cfb2af96326668e1f7ed 100644
(file)
--- a/
target/linux/generic/patches-2.6.32/223-kobject-add-broadcast_uevent.patch
+++ b/
target/linux/generic/patches-2.6.32/223-kobject-add-broadcast_uevent.patch
@@
-20,7
+20,7
@@
#else
static inline int kobject_uevent(struct kobject *kobj,
enum kobject_action action)
#else
static inline int kobject_uevent(struct kobject *kobj,
enum kobject_action action)
-@@ -224,6 +230,16 @@ static inline int add_uevent_var(struct
+@@ -224,6 +230,16 @@ static inline int add_uevent_var(struct
static inline int kobject_action_type(const char *buf, size_t count,
enum kobject_action *type)
{ return -EINVAL; }
static inline int kobject_action_type(const char *buf, size_t count,
enum kobject_action *type)
{ return -EINVAL; }
diff --git
a/target/linux/generic/patches-2.6.32/400-ledtrig_morse.patch
b/target/linux/generic/patches-2.6.32/400-ledtrig_morse.patch
index 1892eb5bd9c8fad928a805757f5d364e8fe79ef9..4edb071adea2d27bd51306575d92b2f6df090254 100644
(file)
--- a/
target/linux/generic/patches-2.6.32/400-ledtrig_morse.patch
+++ b/
target/linux/generic/patches-2.6.32/400-ledtrig_morse.patch
@@
-11,7
+11,7
@@
endif # NEW_LEDS
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
endif # NEW_LEDS
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
-@@ -40,3 +40,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) +=
+@@ -40,3 +40,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) +=
obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) += ledtrig-backlight.o
obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledtrig-gpio.o
obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o
obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) += ledtrig-backlight.o
obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledtrig-gpio.o
obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o
diff --git
a/target/linux/generic/patches-2.6.32/402-ledtrig_netdev.patch
b/target/linux/generic/patches-2.6.32/402-ledtrig_netdev.patch
index 69e3f265cdc3e29f6cde1fb460ebaad6c9e5852d..11b87acac5326366b764293befebcadbc22da5e7 100644
(file)
--- a/
target/linux/generic/patches-2.6.32/402-ledtrig_netdev.patch
+++ b/
target/linux/generic/patches-2.6.32/402-ledtrig_netdev.patch
@@
-14,7
+14,7
@@
endif # NEW_LEDS
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
endif # NEW_LEDS
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
-@@ -41,3 +41,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) +=
+@@ -41,3 +41,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) +=
obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledtrig-gpio.o
obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o
obj-$(CONFIG_LEDS_TRIGGER_MORSE) += ledtrig-morse.o
obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledtrig-gpio.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/patches-2.6.32/511-yaffs-cvs-2009-04-24.patch
b/target/linux/generic/patches-2.6.32/511-yaffs-cvs-2009-04-24.patch
index 5c70e79a058d050e90224ac0ef80dcb1180235ab..c334b17d0872a877f52cd9c0e4234ad118df7d09 100644
(file)
--- a/
target/linux/generic/patches-2.6.32/511-yaffs-cvs-2009-04-24.patch
+++ b/
target/linux/generic/patches-2.6.32/511-yaffs-cvs-2009-04-24.patch
@@
-601,7
+601,7
@@
dev->checkpointBlockList[i] = -1;
}
dev->checkpointBlockList[i] = -1;
}
-@@ -191,18 +185,17 @@ int yaffs_GetCheckpointSum(yaffs_Device
+@@ -191,18 +185,17 @@ int yaffs_GetCheckpointSum(yaffs_Device
static int yaffs_CheckpointFlushBuffer(yaffs_Device *dev)
{
static int yaffs_CheckpointFlushBuffer(yaffs_Device *dev)
{
@@
-926,7
+926,7
@@
{
unsigned char cDelta; /* column parity delta */
unsigned lDelta; /* line parity delta */
{
unsigned char cDelta; /* column parity delta */
unsigned lDelta; /* line parity delta */
-@@ -294,8 +292,7 @@ int yaffs_ECCCorrectOther(unsigned char
+@@ -294,8 +292,7 @@ int yaffs_ECCCorrectOther(unsigned char
return 0; /* no error */
if (lDelta == ~lDeltaPrime &&
return 0; /* no error */
if (lDelta == ~lDeltaPrime &&
@@
-936,7
+936,7
@@
/* Single bit (recoverable) error in data */
bit = 0;
/* Single bit (recoverable) error in data */
bit = 0;
-@@ -307,7 +304,7 @@ int yaffs_ECCCorrectOther(unsigned char
+@@ -307,7 +304,7 @@ int yaffs_ECCCorrectOther(unsigned char
if (cDelta & 0x02)
bit |= 0x01;
if (cDelta & 0x02)
bit |= 0x01;
@@
-945,7
+945,7
@@
return -1;
data[lDelta] ^= (1 << bit);
return -1;
data[lDelta] ^= (1 << bit);
-@@ -316,7 +313,7 @@ int yaffs_ECCCorrectOther(unsigned char
+@@ -316,7 +313,7 @@ int yaffs_ECCCorrectOther(unsigned char
}
if ((yaffs_CountBits32(lDelta) + yaffs_CountBits32(lDeltaPrime) +
}
if ((yaffs_CountBits32(lDelta) + yaffs_CountBits32(lDeltaPrime) +
@@
-954,7
+954,7
@@
/* Reccoverable error in ecc */
*read_ecc = *test_ecc;
/* Reccoverable error in ecc */
*read_ecc = *test_ecc;
-@@ -326,6 +323,4 @@ int yaffs_ECCCorrectOther(unsigned char
+@@ -326,6 +323,4 @@ int yaffs_ECCCorrectOther(unsigned char
/* Unrecoverable error */
return -1;
/* Unrecoverable error */
return -1;
@@
-1398,7
+1398,7
@@
{
unsigned char *alias;
int ret;
{
unsigned char *alias;
int ret;
-@@ -329,7 +395,7 @@ static int yaffs_readlink(struct dentry
+@@ -329,7 +395,7 @@ static int yaffs_readlink(struct dentry
return ret;
}
return ret;
}
@@
-1560,7
+1560,7
@@
static int yaffs_file_flush(struct file *file, fl_owner_t id)
#else
static int yaffs_file_flush(struct file *file)
static int yaffs_file_flush(struct file *file, fl_owner_t id)
#else
static int yaffs_file_flush(struct file *file)
-@@ -513,8 +579,8 @@ static int yaffs_file_flush(struct file
+@@ -513,8 +579,8 @@ static int yaffs_file_flush(struct file
yaffs_Device *dev = obj->myDev;
T(YAFFS_TRACE_OS,
yaffs_Device *dev = obj->myDev;
T(YAFFS_TRACE_OS,
@@
-1571,7
+1571,7
@@
yaffs_GrossLock(dev);
yaffs_GrossLock(dev);
-@@ -535,15 +601,15 @@ static int yaffs_readpage_nolock(struct
+@@ -535,15 +601,15 @@ static int yaffs_readpage_nolock(struct
yaffs_Device *dev;
yaffs_Device *dev;
@@
-1591,7
+1591,7
@@
BUG_ON(!PageLocked(pg));
#else
if (!PageLocked(pg))
BUG_ON(!PageLocked(pg));
#else
if (!PageLocked(pg))
-@@ -555,9 +621,9 @@ static int yaffs_readpage_nolock(struct
+@@ -555,9 +621,9 @@ static int yaffs_readpage_nolock(struct
yaffs_GrossLock(dev);
yaffs_GrossLock(dev);
@@
-1604,7
+1604,7
@@
yaffs_GrossUnlock(dev);
yaffs_GrossUnlock(dev);
-@@ -575,7 +641,7 @@ static int yaffs_readpage_nolock(struct
+@@ -575,7 +641,7 @@ static int yaffs_readpage_nolock(struct
flush_dcache_page(pg);
kunmap(pg);
flush_dcache_page(pg);
kunmap(pg);
@@
-3193,7
+3193,7
@@
if (n < step) {
n++;
continue;
if (n < step) {
n++;
continue;
-@@ -2119,7 +2356,7 @@ static int yaffs_proc_write(struct file
+@@ -2119,7 +2356,7 @@ static int yaffs_proc_write(struct file
char *end;
char *mask_name;
const char *x;
char *end;
char *mask_name;
const char *x;
@@
-3202,7
+3202,7
@@
int i;
int done = 0;
int add, len = 0;
int i;
int done = 0;
int add, len = 0;
-@@ -2129,9 +2366,8 @@ static int yaffs_proc_write(struct file
+@@ -2129,9 +2366,8 @@ static int yaffs_proc_write(struct file
while (!done && (pos < count)) {
done = 1;
while (!done && (pos < count)) {
done = 1;
@@
-3213,7
+3213,7
@@
switch (buf[pos]) {
case '+':
switch (buf[pos]) {
case '+':
-@@ -2148,20 +2384,21 @@ static int yaffs_proc_write(struct file
+@@ -2148,20 +2384,21 @@ static int yaffs_proc_write(struct file
mask_name = NULL;
mask_bitfield = simple_strtoul(buf + pos, &end, 0);
mask_name = NULL;
mask_bitfield = simple_strtoul(buf + pos, &end, 0);
@@
-3240,7
+3240,7
@@
mask_name = mask_flags[i].mask_name;
mask_bitfield = mask_flags[i].mask_bitfield;
done = 0;
mask_name = mask_flags[i].mask_name;
mask_bitfield = mask_flags[i].mask_bitfield;
done = 0;
-@@ -2172,7 +2409,7 @@ static int yaffs_proc_write(struct file
+@@ -2172,7 +2409,7 @@ static int yaffs_proc_write(struct file
if (mask_name != NULL) {
done = 0;
if (mask_name != NULL) {
done = 0;
@@
-3249,7
+3249,7
@@
case '-':
rg &= ~mask_bitfield;
break;
case '-':
rg &= ~mask_bitfield;
break;
-@@ -2191,13 +2428,13 @@ static int yaffs_proc_write(struct file
+@@ -2191,13 +2428,13 @@ static int yaffs_proc_write(struct file
yaffs_traceMask = rg | YAFFS_TRACE_ALWAYS;
yaffs_traceMask = rg | YAFFS_TRACE_ALWAYS;
@@
-5691,7
+5691,7
@@
{
/* Get the real object in case we were fed a hard link as an equivalent object */
equivalentObject = yaffs_GetEquivalentObject(equivalentObject);
{
/* Get the real object in case we were fed a hard link as an equivalent object */
equivalentObject = yaffs_GetEquivalentObject(equivalentObject);
-@@ -2363,33 +2396,31 @@ yaffs_Object *yaffs_Link(yaffs_Object *
+@@ -2363,33 +2396,31 @@ yaffs_Object *yaffs_Link(yaffs_Object *
}
}
@@
-7622,7
+7622,7
@@
int nToCopy;
int n = nBytes;
int nDone = 0;
int nToCopy;
int n = nBytes;
int nDone = 0;
-@@ -4600,27 +4665,26 @@ int yaffs_ReadDataFromFile(yaffs_Object
+@@ -4600,27 +4665,26 @@ int yaffs_ReadDataFromFile(yaffs_Object
dev = in->myDev;
while (n > 0) {
dev = in->myDev;
while (n > 0) {
@@
-7657,7
+7657,7
@@
if (dev->nShortOpCaches > 0) {
/* If we can't find the data in the cache, then load it up. */
if (dev->nShortOpCaches > 0) {
/* If we can't find the data in the cache, then load it up. */
-@@ -4641,14 +4705,9 @@ int yaffs_ReadDataFromFile(yaffs_Object
+@@ -4641,14 +4705,9 @@ int yaffs_ReadDataFromFile(yaffs_Object
cache->locked = 1;
cache->locked = 1;
@@
-7673,7
+7673,7
@@
cache->locked = 0;
} else {
/* Read into the local buffer then copy..*/
cache->locked = 0;
} else {
/* Read into the local buffer then copy..*/
-@@ -4657,41 +4716,19 @@ int yaffs_ReadDataFromFile(yaffs_Object
+@@ -4657,41 +4716,19 @@ int yaffs_ReadDataFromFile(yaffs_Object
yaffs_GetTempBuffer(dev, __LINE__);
yaffs_ReadChunkDataFromObject(in, chunk,
localBuffer);
yaffs_GetTempBuffer(dev, __LINE__);
yaffs_ReadChunkDataFromObject(in, chunk,
localBuffer);
@@
-7718,7
+7718,7
@@
}
n -= nToCopy;
}
n -= nToCopy;
-@@ -4704,28 +4741,37 @@ int yaffs_ReadDataFromFile(yaffs_Object
+@@ -4704,28 +4741,37 @@ int yaffs_ReadDataFromFile(yaffs_Object
return nDone;
}
return nDone;
}
@@
-7923,7
+7923,7
@@
int newFullChunks;
yaffs_Device *dev = in->myDev;
int newFullChunks;
yaffs_Device *dev = in->myDev;
-@@ -4955,13 +4981,11 @@ int yaffs_ResizeFile(yaffs_Object * in,
+@@ -4955,13 +4981,11 @@ int yaffs_ResizeFile(yaffs_Object * in,
yaffs_CheckGarbageCollection(dev);
yaffs_CheckGarbageCollection(dev);
@@
-7941,7
+7941,7
@@
if (newSize < oldFileSize) {
if (newSize < oldFileSize) {
-@@ -4994,21 +5018,20 @@ int yaffs_ResizeFile(yaffs_Object * in,
+@@ -4994,21 +5018,20 @@ int yaffs_ResizeFile(yaffs_Object * in,
}
}
@@
-7968,7
+7968,7
@@
{
obj = yaffs_GetEquivalentObject(obj);
{
obj = yaffs_GetEquivalentObject(obj);
-@@ -5024,7 +5047,7 @@ loff_t yaffs_GetFileSize(yaffs_Object *
+@@ -5024,7 +5047,7 @@ loff_t yaffs_GetFileSize(yaffs_Object *
@@
-9789,7
+9789,7
@@
{
int init_failed = 0;
unsigned x;
{
int init_failed = 0;
unsigned x;
-@@ -7040,6 +7126,8 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7040,6 +7126,8 @@ int yaffs_GutsInitialise(yaffs_Device *
dev->chunkOffset = 0;
dev->nFreeChunks = 0;
dev->chunkOffset = 0;
dev->nFreeChunks = 0;
@@
-9798,7
+9798,7
@@
if (dev->startBlock == 0) {
dev->internalStartBlock = dev->startBlock + 1;
dev->internalEndBlock = dev->endBlock + 1;
if (dev->startBlock == 0) {
dev->internalStartBlock = dev->startBlock + 1;
dev->internalEndBlock = dev->endBlock + 1;
-@@ -7049,18 +7137,18 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7049,18 +7137,18 @@ int yaffs_GutsInitialise(yaffs_Device *
/* Check geometry parameters. */
/* Check geometry parameters. */
@@
-9823,7
+9823,7
@@
return YAFFS_FAIL;
}
return YAFFS_FAIL;
}
-@@ -7070,6 +7158,12 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7070,6 +7158,12 @@ int yaffs_GutsInitialise(yaffs_Device *
return YAFFS_FAIL;
}
return YAFFS_FAIL;
}
@@
-9836,7
+9836,7
@@
/* Got the right mix of functions? */
if (!yaffs_CheckDevFunctions(dev)) {
/* Function missing */
/* Got the right mix of functions? */
if (!yaffs_CheckDevFunctions(dev)) {
/* Function missing */
-@@ -7097,31 +7191,18 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7097,31 +7191,18 @@ int yaffs_GutsInitialise(yaffs_Device *
dev->isMounted = 1;
dev->isMounted = 1;
@@
-9875,7
+9875,7
@@
/*
* Calculate chunkGroupBits.
/*
* Calculate chunkGroupBits.
-@@ -7133,16 +7214,15 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7133,16 +7214,15 @@ int yaffs_GutsInitialise(yaffs_Device *
bits = ShiftsGE(x);
/* Set up tnode width if wide tnodes are enabled. */
bits = ShiftsGE(x);
/* Set up tnode width if wide tnodes are enabled. */
@@
-9896,7
+9896,7
@@
dev->tnodeWidth = 16;
dev->tnodeMask = (1<<dev->tnodeWidth)-1;
dev->tnodeWidth = 16;
dev->tnodeMask = (1<<dev->tnodeWidth)-1;
-@@ -7193,7 +7273,7 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7193,7 +7273,7 @@ int yaffs_GutsInitialise(yaffs_Device *
dev->hasPendingPrioritisedGCs = 1; /* Assume the worst for now, will get fixed on first GC */
/* Initialise temporary buffers and caches. */
dev->hasPendingPrioritisedGCs = 1; /* Assume the worst for now, will get fixed on first GC */
/* Initialise temporary buffers and caches. */
@@
-9905,7
+9905,7
@@
init_failed = 1;
dev->srCache = NULL;
init_failed = 1;
dev->srCache = NULL;
-@@ -7203,25 +7283,26 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7203,25 +7283,26 @@ int yaffs_GutsInitialise(yaffs_Device *
if (!init_failed &&
dev->nShortOpCaches > 0) {
int i;
if (!init_failed &&
dev->nShortOpCaches > 0) {
int i;
@@
-9940,7
+9940,7
@@
init_failed = 1;
dev->srLastUse = 0;
init_failed = 1;
dev->srLastUse = 0;
-@@ -7229,29 +7310,30 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7229,29 +7310,30 @@ int yaffs_GutsInitialise(yaffs_Device *
dev->cacheHits = 0;
dev->cacheHits = 0;
@@
-9979,7
+9979,7
@@
T(YAFFS_TRACE_ALWAYS,
(TSTR("yaffs: restored from checkpoint" TENDSTR)));
} else {
T(YAFFS_TRACE_ALWAYS,
(TSTR("yaffs: restored from checkpoint" TENDSTR)));
} else {
-@@ -7273,24 +7355,25 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7273,24 +7355,25 @@ int yaffs_GutsInitialise(yaffs_Device *
dev->nBackgroundDeletions = 0;
dev->oldestDirtySequence = 0;
dev->nBackgroundDeletions = 0;
dev->oldestDirtySequence = 0;
@@
-10011,7
+10011,7
@@
/* Clean up the mess */
T(YAFFS_TRACE_TRACING,
(TSTR("yaffs: yaffs_GutsInitialise() aborted.\n" TENDSTR)));
/* Clean up the mess */
T(YAFFS_TRACE_TRACING,
(TSTR("yaffs: yaffs_GutsInitialise() aborted.\n" TENDSTR)));
-@@ -7318,7 +7401,7 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7318,7 +7401,7 @@ int yaffs_GutsInitialise(yaffs_Device *
}
}
@@
-10710,7
+10710,7
@@
{
if (etags) {
memset(etags, 0, sizeof(*etags));
{
if (etags) {
memset(etags, 0, sizeof(*etags));
-@@ -169,9 +169,9 @@ static int rettags(yaffs_ExtendedTags *
+@@ -169,9 +169,9 @@ static int rettags(yaffs_ExtendedTags *
* Returns YAFFS_OK or YAFFS_FAIL.
*/
int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device *dev,
* Returns YAFFS_OK or YAFFS_FAIL.
*/
int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device *dev,
@@
-11038,14
+11038,14
@@
+ yaffs_UnpackTags2(tags, &pt);
+ }
+ }
+ yaffs_UnpackTags2(tags, &pt);
+ }
+ }
-
-- if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
-- tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
++
+ if (localData)
+ yaffs_ReleaseTempBuffer(dev, data, __LINE__);
+ if (localData)
+ yaffs_ReleaseTempBuffer(dev, data, __LINE__);
+- if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
+ if (tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
+ if (tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
-+ tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
+ tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
+-
if (retval == 0)
return YAFFS_OK;
else
if (retval == 0)
return YAFFS_OK;
else
diff --git
a/target/linux/generic/patches-2.6.32/903-hostap_txpower.patch
b/target/linux/generic/patches-2.6.32/903-hostap_txpower.patch
index 7552ceb33dd00fc0be9381b325389e3a6b0a16bc..22a65924da155e63575004a51a036e81f6a23a60 100644
(file)
--- a/
target/linux/generic/patches-2.6.32/903-hostap_txpower.patch
+++ b/
target/linux/generic/patches-2.6.32/903-hostap_txpower.patch
@@
-1,6
+1,6
@@
--- a/drivers/net/wireless/hostap/hostap_ap.c
+++ b/drivers/net/wireless/hostap/hostap_ap.c
--- a/drivers/net/wireless/hostap/hostap_ap.c
+++ b/drivers/net/wireless/hostap/hostap_ap.c
-@@ -2335,13 +2335,13 @@ int prism2_ap_get_sta_qual(local_info_t
+@@ -2335,13 +2335,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)
addr[count].sa_family = ARPHRD_ETHER;
memcpy(addr[count].sa_data, sta->addr, ETH_ALEN);
if (sta->last_rx_silence == 0)
diff --git
a/target/linux/generic/patches-2.6.32/930-kmsg_dump_backport.patch
b/target/linux/generic/patches-2.6.32/930-kmsg_dump_backport.patch
index 0ac0900842b7a25037b81517e76636c1df0e29c8..b9091c7b23fea0a8d08a6db7b312dff7100ac3d1 100644
(file)
--- a/
target/linux/generic/patches-2.6.32/930-kmsg_dump_backport.patch
+++ b/
target/linux/generic/patches-2.6.32/930-kmsg_dump_backport.patch
@@
-55,7
+55,7
@@
#include <linux/kallsyms.h>
#include <linux/notifier.h>
#include <linux/module.h>
#include <linux/kallsyms.h>
#include <linux/notifier.h>
#include <linux/module.h>
-@@ -74,6 +75,7 @@ NORET_TYPE void panic(const char * fmt,
+@@ -74,6 +75,7 @@ NORET_TYPE void panic(const char * fmt,
dump_stack();
#endif
dump_stack();
#endif
diff --git
a/target/linux/generic/patches-2.6.32/971-ocf_20100325.patch
b/target/linux/generic/patches-2.6.32/971-ocf_20100325.patch
index 0b0c1e279c79dc86dbda83d48e7fcb2aabd503c9..8eff02fa6c951cd3f622110ec8fad5ec4ea13696 100644
(file)
--- a/
target/linux/generic/patches-2.6.32/971-ocf_20100325.patch
+++ b/
target/linux/generic/patches-2.6.32/971-ocf_20100325.patch
@@
-24,7
+24,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.
* 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.
-@@ -714,6 +724,61 @@ void add_disk_randomness(struct gendisk
+@@ -714,6 +724,61 @@ void add_disk_randomness(struct gendisk
}
#endif
}
#endif
diff --git
a/target/linux/generic/patches-2.6.32/975-ssb_update.patch
b/target/linux/generic/patches-2.6.32/975-ssb_update.patch
index 0cb84830212b8fc25a13b99ef2df9f9b3adeec93..373df1a62de598e2db980037bfb7541b2b6b16ec 100644
(file)
--- a/
target/linux/generic/patches-2.6.32/975-ssb_update.patch
+++ b/
target/linux/generic/patches-2.6.32/975-ssb_update.patch
@@
-343,7
+343,10
@@
+static int ssb_pcmcia_get_mac(struct pcmcia_device *p_dev,
+ tuple_t *tuple,
+ void *priv)
+static int ssb_pcmcia_get_mac(struct pcmcia_device *p_dev,
+ tuple_t *tuple,
+ void *priv)
-+{
+ {
+- tuple_t tuple;
+- int res;
+- unsigned char buf[32];
+ struct ssb_sprom *sprom = priv;
+
+ if (tuple->TupleData[0] != CISTPL_FUNCE_LAN_NODE_ID)
+ struct ssb_sprom *sprom = priv;
+
+ if (tuple->TupleData[0] != CISTPL_FUNCE_LAN_NODE_ID)
@@
-359,10
+362,7
@@
+static int ssb_pcmcia_do_get_invariants(struct pcmcia_device *p_dev,
+ tuple_t *tuple,
+ void *priv)
+static int ssb_pcmcia_do_get_invariants(struct pcmcia_device *p_dev,
+ tuple_t *tuple,
+ void *priv)
- {
-- tuple_t tuple;
-- int res;
-- unsigned char buf[32];
++{
+ struct ssb_init_invariants *iv = priv;
struct ssb_sprom *sprom = &iv->sprom;
struct ssb_boardinfo *bi = &iv->boardinfo;
+ struct ssb_init_invariants *iv = priv;
struct ssb_sprom *sprom = &iv->sprom;
struct ssb_boardinfo *bi = &iv->boardinfo;
diff --git
a/target/linux/generic/patches-2.6.32/998-openwrt_lzma_options.patch
b/target/linux/generic/patches-2.6.32/998-openwrt_lzma_options.patch
index face9154d8da77d1abdb032bf5acee19b4bf0961..f81e22f116ddf86a0bce29587eb6ba454de397fc 100644
(file)
--- a/
target/linux/generic/patches-2.6.32/998-openwrt_lzma_options.patch
+++ b/
target/linux/generic/patches-2.6.32/998-openwrt_lzma_options.patch
@@
-1,6
+1,6
@@
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
-@@ -228,7 +228,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^)
+@@ -228,7 +228,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^)
quiet_cmd_lzma = LZMA $@
cmd_lzma = (cat $(filter-out FORCE,$^) | \
quiet_cmd_lzma = LZMA $@
cmd_lzma = (cat $(filter-out FORCE,$^) | \
diff --git
a/target/linux/iop32x/Makefile
b/target/linux/iop32x/Makefile
index 727a12985789271a6950e8f691c9b9a8a7c2230e..9ec3cb5054f792056611a9c64d9af78607d0e19a 100644
(file)
--- a/
target/linux/iop32x/Makefile
+++ b/
target/linux/iop32x/Makefile
@@
-12,7
+12,7
@@
BOARDNAME:=Intel IOP32x
FEATURES:=squashfs
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
FEATURES:=squashfs
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-LINUX_VERSION:=2.6.32.
29
+LINUX_VERSION:=2.6.32.
32
include $(INCLUDE_DIR)/target.mk
include $(INCLUDE_DIR)/target.mk
diff --git
a/target/linux/omap35xx/Makefile
b/target/linux/omap35xx/Makefile
index cf91ae854222f9c180a597ccc7d809583f4d1cf8..eb0e345237405a338d08fde4ff1a29dc4b2c69aa 100644
(file)
--- a/
target/linux/omap35xx/Makefile
+++ b/
target/linux/omap35xx/Makefile
@@
-12,7
+12,7
@@
BOARDNAME:=TI OMAP35xx
FEATURES:=broken
SUBTARGETS=beagleboard gumstix
FEATURES:=broken
SUBTARGETS=beagleboard gumstix
-LINUX_VERSION:=2.6.32.
29
+LINUX_VERSION:=2.6.32.
32
KERNELNAME:="uImage"
DEVICE_TYPE=developerboard
KERNELNAME:="uImage"
DEVICE_TYPE=developerboard
diff --git
a/target/linux/ppc40x/Makefile
b/target/linux/ppc40x/Makefile
index 8cd4cb270a43c163d92be97526f20ff17f4c1187..11ce72b053d35f58db02d63ce699e6d3d69e9389 100644
(file)
--- a/
target/linux/ppc40x/Makefile
+++ b/
target/linux/ppc40x/Makefile
@@
-13,7
+13,7
@@
FEATURES:=squashfs
CFLAGS:=-Os -pipe -funit-at-a-time -mcpu=405
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
CFLAGS:=-Os -pipe -funit-at-a-time -mcpu=405
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-LINUX_VERSION:=2.6.32.
29
+LINUX_VERSION:=2.6.32.
32
include $(INCLUDE_DIR)/target.mk
include $(INCLUDE_DIR)/target.mk
diff --git
a/target/linux/ppc44x/Makefile
b/target/linux/ppc44x/Makefile
index 771bf14b26f9dba470a0b985bafc179f59ce7eed..6e4404e2c1e1f737991f9f50c8609397e83a915f 100644
(file)
--- a/
target/linux/ppc44x/Makefile
+++ b/
target/linux/ppc44x/Makefile
@@
-13,7
+13,7
@@
FEATURES:=squashfs
CFLAGS:=-Os -pipe -funit-at-a-time -mcpu=440
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
CFLAGS:=-Os -pipe -funit-at-a-time -mcpu=440
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-LINUX_VERSION:=2.6.32.
29
+LINUX_VERSION:=2.6.32.
32
include $(INCLUDE_DIR)/target.mk
include $(INCLUDE_DIR)/target.mk
diff --git
a/target/linux/pxa/Makefile
b/target/linux/pxa/Makefile
index 577053ec188452e25213eca873da5c4a8500d766..747e4fdba073a1d7a795d6bc6cbd778cdca7b28a 100644
(file)
--- a/
target/linux/pxa/Makefile
+++ b/
target/linux/pxa/Makefile
@@
-12,7
+12,7
@@
BOARDNAME:=Marvell/Intel PXA2xx
FEATURES:=squashfs
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
FEATURES:=squashfs
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-LINUX_VERSION:=2.6.32.
29
+LINUX_VERSION:=2.6.32.
32
include $(INCLUDE_DIR)/target.mk
include $(INCLUDE_DIR)/target.mk
diff --git
a/target/linux/rb532/Makefile
b/target/linux/rb532/Makefile
index 59e7d7b9b06b056722cfa206c73b2967fcf29138..45b33a4638ff8d4b12166becaf530bb516a29373 100644
(file)
--- a/
target/linux/rb532/Makefile
+++ b/
target/linux/rb532/Makefile
@@
-11,7
+11,7
@@
BOARD:=rb532
BOARDNAME:=Mikrotik RouterBoard 532
FEATURES:=jffs2 pci targz
BOARDNAME:=Mikrotik RouterBoard 532
FEATURES:=jffs2 pci targz
-LINUX_VERSION:=2.6.32.
29
+LINUX_VERSION:=2.6.32.
32
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += wpad-mini kmod-madwifi kmod-input-rb532
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += wpad-mini kmod-madwifi kmod-input-rb532
diff --git
a/target/linux/rdc/Makefile
b/target/linux/rdc/Makefile
index cd0179f3d81aa9602b887b4bd398fd02543bbddc..5527a6a208622cb4964a61b4aea433a9d388b68c 100644
(file)
--- a/
target/linux/rdc/Makefile
+++ b/
target/linux/rdc/Makefile
@@
-12,7
+12,7
@@
BOARDNAME:=RDC 321x
FEATURES:=squashfs jffs2 pci usb pcmcia
CFLAGS:=-Os -pipe -march=i486 -mtune=i486 -funit-at-a-time
FEATURES:=squashfs jffs2 pci usb pcmcia
CFLAGS:=-Os -pipe -march=i486 -mtune=i486 -funit-at-a-time
-LINUX_VERSION:=2.6.32.
29
+LINUX_VERSION:=2.6.32.
32
include $(INCLUDE_DIR)/target.mk
include $(INCLUDE_DIR)/target.mk
diff --git
a/target/linux/sibyte/Makefile
b/target/linux/sibyte/Makefile
index 9de993ebd1f6b3f54f4ddd3891a218031e9496cb..565a57b010b79a0538dcaed83c19cfe3ac02d1e9 100644
(file)
--- a/
target/linux/sibyte/Makefile
+++ b/
target/linux/sibyte/Makefile
@@
-13,7
+13,7
@@
FEATURES:=fpu
CFLAGS:=-Os -pipe -march=sb1 -funit-at-a-time
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
CFLAGS:=-Os -pipe -march=sb1 -funit-at-a-time
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-LINUX_VERSION:=2.6.32.
29
+LINUX_VERSION:=2.6.32.
32
include $(INCLUDE_DIR)/target.mk
include $(INCLUDE_DIR)/target.mk
diff --git
a/target/linux/x86/Makefile
b/target/linux/x86/Makefile
index 034389d3fa0b852f3bc2e384f5b0e2e7a1a9b6f8..e491ee0f459b14e253728e472e0abd7b95db760b 100644
(file)
--- a/
target/linux/x86/Makefile
+++ b/
target/linux/x86/Makefile
@@
-12,7
+12,7
@@
BOARDNAME:=x86
FEATURES:=squashfs jffs2 ext4 vdi vmdk pcmcia targz
SUBTARGETS=generic olpc xen_domu ep80579 net5501 kvm_guest geos
FEATURES:=squashfs jffs2 ext4 vdi vmdk pcmcia targz
SUBTARGETS=generic olpc xen_domu ep80579 net5501 kvm_guest geos
-LINUX_VERSION:=2.6.32.
29
+LINUX_VERSION:=2.6.32.
32
include $(INCLUDE_DIR)/target.mk
include $(INCLUDE_DIR)/target.mk