diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2010-01-28 11:54:20 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2010-01-28 11:54:20 +0000 |
| commit | 629cba4013b0465e4aac7815d256950ca68c7429 (patch) | |
| tree | 8b96a9f12e9ec3b6fa87a666e0f16fc920a9fe81 /target/linux/xburst | |
| parent | 39908a74dc7431b9c975b61dd37935d87e83139d (diff) | |
| download | master-187ad058-629cba4013b0465e4aac7815d256950ca68c7429.tar.gz master-187ad058-629cba4013b0465e4aac7815d256950ca68c7429.tar.bz2 master-187ad058-629cba4013b0465e4aac7815d256950ca68c7429.zip | |
kernel: update to 2.6.32.6
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19358 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/xburst')
19 files changed, 52 insertions, 202 deletions
diff --git a/target/linux/xburst/Makefile b/target/linux/xburst/Makefile index 571cc296ee..67de2cc6d9 100644 --- a/target/linux/xburst/Makefile +++ b/target/linux/xburst/Makefile @@ -11,7 +11,7 @@ BOARD:=xburst BOARDNAME:=XBurst JZ47x0 FEATURES:=jffs2 tgz ubifs -LINUX_VERSION:=2.6.32.4 +LINUX_VERSION:=2.6.32.6 DEVICE_TYPE=other diff --git a/target/linux/xburst/patches-2.6.32/001-core.patch b/target/linux/xburst/patches-2.6.32/001-core.patch index 95e5e40116..2c354cda67 100644 --- a/target/linux/xburst/patches-2.6.32/001-core.patch +++ b/target/linux/xburst/patches-2.6.32/001-core.patch @@ -18,8 +18,6 @@ Subject: [PATCH] /opt/Projects/openwrt/target/linux/xburst/patches-2.6.31/001-co arch/mips/mm/tlbex.c | 5 + 12 files changed, 379 insertions(+), 4 deletions(-) -diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig -index fd7620f..9b40aa8 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -174,6 +174,9 @@ config MACH_JAZZ @@ -40,7 +38,7 @@ index fd7620f..9b40aa8 100644 source "arch/mips/lasat/Kconfig" source "arch/mips/pmc-sierra/Kconfig" source "arch/mips/sgi-ip27/Kconfig" -@@ -1895,6 +1899,14 @@ config NR_CPUS +@@ -1913,6 +1917,14 @@ config NR_CPUS source "kernel/time/Kconfig" @@ -55,11 +53,9 @@ index fd7620f..9b40aa8 100644 # # Timer Interrupt Frequency Configuration # -diff --git a/arch/mips/Makefile b/arch/mips/Makefile -index 77f5021..1b22297 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile -@@ -184,6 +184,14 @@ cflags-$(CONFIG_AR7) += -I$(srctree)/arch/mips/include/asm/mach-ar7 +@@ -184,6 +184,14 @@ cflags-$(CONFIG_AR7) += -I$(srctree)/ar load-$(CONFIG_AR7) += 0xffffffff94100000 # @@ -74,7 +70,7 @@ index 77f5021..1b22297 100644 # Acer PICA 61, Mips Magnum 4000 and Olivetti M700. # core-$(CONFIG_MACH_JAZZ) += arch/mips/jazz/ -@@ -702,6 +710,12 @@ makeboot =$(Q)$(MAKE) $(build)=arch/mips/boot VMLINUX=$(vmlinux-32) $(1) +@@ -705,6 +713,12 @@ makeboot =$(Q)$(MAKE) $(build)=arch/mips all: $(all-y) @@ -87,7 +83,7 @@ index 77f5021..1b22297 100644 vmlinux.bin: $(vmlinux-32) +@$(call makeboot,$@) -@@ -731,6 +745,7 @@ install: +@@ -734,6 +748,7 @@ install: archclean: @$(MAKE) $(clean)=arch/mips/boot @@ -95,7 +91,7 @@ index 77f5021..1b22297 100644 @$(MAKE) $(clean)=arch/mips/lasat define archhelp -@@ -738,6 +753,9 @@ define archhelp +@@ -741,6 +756,9 @@ define archhelp echo ' vmlinux.ecoff - ECOFF boot image' echo ' vmlinux.bin - Raw binary boot image' echo ' vmlinux.srec - SREC boot image' @@ -105,8 +101,6 @@ index 77f5021..1b22297 100644 echo echo ' These will be default as apropriate for a configured platform.' endef -diff --git a/arch/mips/boot/Makefile b/arch/mips/boot/Makefile -index 2a209d7..1cfce3e 100644 --- a/arch/mips/boot/Makefile +++ b/arch/mips/boot/Makefile @@ -7,6 +7,9 @@ @@ -119,7 +113,7 @@ index 2a209d7..1cfce3e 100644 # # Some DECstations need all possible sections of an ECOFF executable # -@@ -25,7 +28,7 @@ strip-flags = $(addprefix --remove-section=,$(drop-sections)) +@@ -25,7 +28,7 @@ strip-flags = $(addprefix --remove-secti VMLINUX = vmlinux @@ -154,8 +148,6 @@ index 2a209d7..1cfce3e 100644 + vmlinux.bin.gz \ + uImage \ + zImage -diff --git a/arch/mips/include/asm/bootinfo.h b/arch/mips/include/asm/bootinfo.h -index f5dfaf6..584376f 100644 --- a/arch/mips/include/asm/bootinfo.h +++ b/arch/mips/include/asm/bootinfo.h @@ -69,6 +69,12 @@ @@ -171,8 +163,6 @@ index f5dfaf6..584376f 100644 #define CL_SIZE COMMAND_LINE_SIZE extern char *system_type; -diff --git a/arch/mips/include/asm/cpu.h b/arch/mips/include/asm/cpu.h -index 4b96d1a..478a527 100644 --- a/arch/mips/include/asm/cpu.h +++ b/arch/mips/include/asm/cpu.h @@ -34,7 +34,7 @@ @@ -209,8 +199,6 @@ index 4b96d1a..478a527 100644 CPU_LAST }; -diff --git a/arch/mips/include/asm/mach-generic/irq.h b/arch/mips/include/asm/mach-generic/irq.h -index 70d9a25..73b7a83 100644 --- a/arch/mips/include/asm/mach-generic/irq.h +++ b/arch/mips/include/asm/mach-generic/irq.h @@ -9,7 +9,7 @@ @@ -222,8 +210,6 @@ index 70d9a25..73b7a83 100644 #endif #ifdef CONFIG_I8259 -diff --git a/arch/mips/include/asm/r4kcache.h b/arch/mips/include/asm/r4kcache.h -index 387bf59..b500056 100644 --- a/arch/mips/include/asm/r4kcache.h +++ b/arch/mips/include/asm/r4kcache.h @@ -17,6 +17,58 @@ @@ -285,7 +271,7 @@ index 387bf59..b500056 100644 /* * This macro return a properly sign-extended address suitable as base address * for indexed cache operations. Two issues here: -@@ -144,6 +196,7 @@ static inline void flush_icache_line_indexed(unsigned long addr) +@@ -144,6 +196,7 @@ static inline void flush_icache_line_ind { __iflush_prologue cache_op(Index_Invalidate_I, addr); @@ -293,7 +279,7 @@ index 387bf59..b500056 100644 __iflush_epilogue } -@@ -151,6 +204,7 @@ static inline void flush_dcache_line_indexed(unsigned long addr) +@@ -151,6 +204,7 @@ static inline void flush_dcache_line_ind { __dflush_prologue cache_op(Index_Writeback_Inv_D, addr); @@ -301,7 +287,7 @@ index 387bf59..b500056 100644 __dflush_epilogue } -@@ -163,6 +217,7 @@ static inline void flush_icache_line(unsigned long addr) +@@ -163,6 +217,7 @@ static inline void flush_icache_line(uns { __iflush_prologue cache_op(Hit_Invalidate_I, addr); @@ -309,7 +295,7 @@ index 387bf59..b500056 100644 __iflush_epilogue } -@@ -170,6 +225,7 @@ static inline void flush_dcache_line(unsigned long addr) +@@ -170,6 +225,7 @@ static inline void flush_dcache_line(uns { __dflush_prologue cache_op(Hit_Writeback_Inv_D, addr); @@ -317,7 +303,7 @@ index 387bf59..b500056 100644 __dflush_epilogue } -@@ -177,6 +233,7 @@ static inline void invalidate_dcache_line(unsigned long addr) +@@ -177,6 +233,7 @@ static inline void invalidate_dcache_lin { __dflush_prologue cache_op(Hit_Invalidate_D, addr); @@ -325,7 +311,7 @@ index 387bf59..b500056 100644 __dflush_epilogue } -@@ -209,6 +266,7 @@ static inline void flush_scache_line(unsigned long addr) +@@ -209,6 +266,7 @@ static inline void flush_scache_line(uns static inline void protected_flush_icache_line(unsigned long addr) { protected_cache_op(Hit_Invalidate_I, addr); @@ -333,7 +319,7 @@ index 387bf59..b500056 100644 } /* -@@ -220,6 +278,7 @@ static inline void protected_flush_icache_line(unsigned long addr) +@@ -220,6 +278,7 @@ static inline void protected_flush_icach static inline void protected_writeback_dcache_line(unsigned long addr) { protected_cache_op(Hit_Writeback_Inv_D, addr); @@ -341,7 +327,7 @@ index 387bf59..b500056 100644 } static inline void protected_writeback_scache_line(unsigned long addr) -@@ -396,8 +455,10 @@ static inline void blast_##pfx##cache##lsize##_page_indexed(unsigned long page) +@@ -396,8 +455,10 @@ static inline void blast_##pfx##cache##l __BUILD_BLAST_CACHE(d, dcache, Index_Writeback_Inv_D, Hit_Writeback_Inv_D, 16) __BUILD_BLAST_CACHE(i, icache, Index_Invalidate_I, Hit_Invalidate_I, 16) __BUILD_BLAST_CACHE(s, scache, Index_Writeback_Inv_SD, Hit_Writeback_Inv_SD, 16) @@ -352,7 +338,7 @@ index 387bf59..b500056 100644 __BUILD_BLAST_CACHE(s, scache, Index_Writeback_Inv_SD, Hit_Writeback_Inv_SD, 32) __BUILD_BLAST_CACHE(d, dcache, Index_Writeback_Inv_D, Hit_Writeback_Inv_D, 64) __BUILD_BLAST_CACHE(i, icache, Index_Invalidate_I, Hit_Invalidate_I, 64) -@@ -405,12 +466,122 @@ __BUILD_BLAST_CACHE(s, scache, Index_Writeback_Inv_SD, Hit_Writeback_Inv_SD, 64) +@@ -405,12 +466,122 @@ __BUILD_BLAST_CACHE(s, scache, Index_Wri __BUILD_BLAST_CACHE(s, scache, Index_Writeback_Inv_SD, Hit_Writeback_Inv_SD, 128) __BUILD_BLAST_CACHE(inv_d, dcache, Index_Writeback_Inv_D, Hit_Invalidate_D, 16) @@ -475,7 +461,7 @@ index 387bf59..b500056 100644 /* build blast_xxx_range, protected_blast_xxx_range */ #define __BUILD_BLAST_CACHE_RANGE(pfx, desc, hitop, prot) \ static inline void prot##blast_##pfx##cache##_range(unsigned long start, \ -@@ -432,13 +603,73 @@ static inline void prot##blast_##pfx##cache##_range(unsigned long start, \ +@@ -432,13 +603,73 @@ static inline void prot##blast_##pfx##ca __##pfx##flush_epilogue \ } @@ -549,8 +535,6 @@ index 387bf59..b500056 100644 +#endif /* CONFIG_JZRISC */ + #endif /* _ASM_R4KCACHE_H */ -diff --git a/arch/mips/include/asm/suspend.h b/arch/mips/include/asm/suspend.h -index 294cdb6..94dc597 100644 --- a/arch/mips/include/asm/suspend.h +++ b/arch/mips/include/asm/suspend.h @@ -2,6 +2,9 @@ @@ -563,8 +547,6 @@ index 294cdb6..94dc597 100644 /* References to section boundaries */ extern const void __nosave_begin, __nosave_end; -diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c -index 7a51866..fd12b0c 100644 --- a/arch/mips/kernel/cpu-probe.c +++ b/arch/mips/kernel/cpu-probe.c @@ -160,6 +160,7 @@ void __init check_wait(void) @@ -575,7 +557,7 @@ index 7a51866..fd12b0c 100644 cpu_wait = r4k_wait; break; -@@ -902,6 +903,23 @@ static inline void cpu_probe_cavium(struct cpuinfo_mips *c, unsigned int cpu) +@@ -902,6 +903,23 @@ static inline void cpu_probe_cavium(stru } } @@ -609,8 +591,6 @@ index 7a51866..fd12b0c 100644 } BUG_ON(!__cpu_name[cpu]); -diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c -index 6721ee2..dd4b70b 100644 --- a/arch/mips/mm/c-r4k.c +++ b/arch/mips/mm/c-r4k.c @@ -928,6 +928,36 @@ static void __cpuinit probe_pcache(void) @@ -650,11 +630,9 @@ index 6721ee2..dd4b70b 100644 default: if (!(config & MIPS_CONF_M)) panic("Don't know how to probe P-caches on this cpu."); -diff --git a/arch/mips/mm/cache.c b/arch/mips/mm/cache.c -index 694d51f..4b2bc95 100644 --- a/arch/mips/mm/cache.c +++ b/arch/mips/mm/cache.c -@@ -52,6 +52,8 @@ void (*_dma_cache_wback)(unsigned long start, unsigned long size); +@@ -52,6 +52,8 @@ void (*_dma_cache_wback)(unsigned long s void (*_dma_cache_inv)(unsigned long start, unsigned long size); EXPORT_SYMBOL(_dma_cache_wback_inv); @@ -663,11 +641,9 @@ index 694d51f..4b2bc95 100644 #endif /* CONFIG_DMA_NONCOHERENT */ -diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c -index bb1719a..13c128d 100644 --- a/arch/mips/mm/tlbex.c +++ b/arch/mips/mm/tlbex.c -@@ -389,6 +389,11 @@ static void __cpuinit build_tlb_write_entry(u32 **p, struct uasm_label **l, +@@ -389,6 +389,11 @@ static void __cpuinit build_tlb_write_en tlbw(p); break; @@ -679,6 +655,3 @@ index bb1719a..13c128d 100644 default: panic("No TLB refill handler yet (CPU type: %d)", current_cpu_data.cputype); --- -1.5.6.5 - diff --git a/target/linux/xburst/patches-2.6.32/050-nand.patch b/target/linux/xburst/patches-2.6.32/050-nand.patch index af53c322d9..e803a218b5 100644 --- a/target/linux/xburst/patches-2.6.32/050-nand.patch +++ b/target/linux/xburst/patches-2.6.32/050-nand.patch @@ -9,8 +9,6 @@ Subject: [PATCH] /opt/Projects/openwrt/target/linux/xburst/patches-2.6.31/050-na drivers/mtd/nand/nand_base.c | 19 +++++++------------ 3 files changed, 14 insertions(+), 12 deletions(-) -diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig -index 2fda0b6..8b28828 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig @@ -482,4 +482,10 @@ config MTD_NAND_W90P910 @@ -24,22 +22,18 @@ index 2fda0b6..8b28828 100644 + Support NAND Flash device on Jz4740 board + endif # MTD_NAND -diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile -index 6950d3d..1661534 100644 --- a/drivers/mtd/nand/Makefile +++ b/drivers/mtd/nand/Makefile -@@ -42,5 +42,6 @@ obj-$(CONFIG_MTD_NAND_SOCRATES) += socrates_nand.o +@@ -42,5 +42,6 @@ obj-$(CONFIG_MTD_NAND_SOCRATES) += socr obj-$(CONFIG_MTD_NAND_TXX9NDFMC) += txx9ndfmc.o obj-$(CONFIG_MTD_NAND_W90P910) += w90p910_nand.o obj-$(CONFIG_MTD_NAND_NOMADIK) += nomadik_nand.o +obj-$(CONFIG_MTD_NAND_JZ4740) += jz4740_nand.o nand-objs := nand_base.o nand_bbt.o -diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c -index 2957cc7..33ed710 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c -@@ -956,29 +956,22 @@ static int nand_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip, +@@ -956,29 +956,22 @@ static int nand_read_page_hwecc(struct m uint8_t *ecc_calc = chip->buffers->ecccalc; uint8_t *ecc_code = chip->buffers->ecccode; uint32_t *eccpos = chip->ecc.layout->eccpos; @@ -74,7 +68,7 @@ index 2957cc7..33ed710 100644 return 0; } -@@ -1178,6 +1171,8 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from, +@@ -1178,6 +1171,8 @@ static int nand_do_read_ops(struct mtd_i bufpoi = aligned ? buf : chip->buffers->databuf; if (likely(sndcmd)) { @@ -83,6 +77,3 @@ index 2957cc7..33ed710 100644 chip->cmdfunc(mtd, NAND_CMD_READ0, 0x00, page); sndcmd = 0; } --- -1.5.6.5 - diff --git a/target/linux/xburst/patches-2.6.32/051-fb.patch b/target/linux/xburst/patches-2.6.32/051-fb.patch index 03565748db..5c802da6d0 100644 --- a/target/linux/xburst/patches-2.6.32/051-fb.patch +++ b/target/linux/xburst/patches-2.6.32/051-fb.patch @@ -8,8 +8,6 @@ Subject: [PATCH] /opt/Projects/openwrt/target/linux/xburst/patches-2.6.31/051-fb drivers/video/Makefile | 1 + 2 files changed, 10 insertions(+), 0 deletions(-) -diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig -index 188e1ba..c8ec6ad 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -2160,6 +2160,15 @@ config FB_BROADSHEET @@ -28,11 +26,9 @@ index 188e1ba..c8ec6ad 100644 source "drivers/video/omap/Kconfig" source "drivers/video/backlight/Kconfig" -diff --git a/drivers/video/Makefile b/drivers/video/Makefile -index 80232e1..b3ce701 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile -@@ -128,6 +128,7 @@ obj-$(CONFIG_XEN_FBDEV_FRONTEND) += xen-fbfront.o +@@ -128,6 +128,7 @@ obj-$(CONFIG_XEN_FBDEV_FRONTEND) += xen obj-$(CONFIG_FB_CARMINE) += carminefb.o obj-$(CONFIG_FB_MB862XX) += mb862xx/ obj-$(CONFIG_FB_MSM) += msm/ @@ -40,6 +36,3 @@ index 80232e1..b3ce701 100644 # Platform or fallback drivers go here obj-$(CONFIG_FB_UVESA) += uvesafb.o --- -1.5.6.5 - diff --git a/target/linux/xburst/patches-2.6.32/052-rtc.patch b/target/linux/xburst/patches-2.6.32/052-rtc.patch index 816028ba0d..5c9a434434 100644 --- a/target/linux/xburst/patches-2.6.32/052-rtc.patch +++ b/target/linux/xburst/patches-2.6.32/052-rtc.patch @@ -8,8 +8,6 @@ Subject: [PATCH] /opt/Projects/openwrt/target/linux/xburst/patches-2.6.31/052-rt drivers/rtc/Makefile | 1 + 2 files changed, 12 insertions(+), 0 deletions(-) -diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig -index 3c20dae..930bc4a 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig @@ -469,6 +469,17 @@ config RTC_DRV_EFI @@ -30,11 +28,9 @@ index 3c20dae..930bc4a 100644 config RTC_DRV_STK17TA8 tristate "Simtek STK17TA8" depends on RTC_CLASS -diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile -index aa3fbd5..2153d90 100644 --- a/drivers/rtc/Makefile +++ b/drivers/rtc/Makefile -@@ -44,6 +44,7 @@ obj-$(CONFIG_RTC_DRV_EP93XX) += rtc-ep93xx.o +@@ -44,6 +44,7 @@ obj-$(CONFIG_RTC_DRV_EP93XX) += rtc-ep93 obj-$(CONFIG_RTC_DRV_FM3130) += rtc-fm3130.o obj-$(CONFIG_RTC_DRV_GENERIC) += rtc-generic.o obj-$(CONFIG_RTC_DRV_ISL1208) += rtc-isl1208.o @@ -42,6 +38,3 @@ index aa3fbd5..2153d90 100644 obj-$(CONFIG_RTC_DRV_M41T80) += rtc-m41t80.o obj-$(CONFIG_RTC_DRV_M41T94) += rtc-m41t94.o obj-$(CONFIG_RTC_DRV_M48T35) += rtc-m48t35.o --- -1.5.6.5 - diff --git a/target/linux/xburst/patches-2.6.32/053-adc.patch b/target/linux/xburst/patches-2.6.32/053-adc.patch index 348d96fb2e..786d2ffd15 100644 --- a/target/linux/xburst/patches-2.6.32/053-adc.patch +++ b/target/linux/xburst/patches-2.6.32/053-adc.patch @@ -8,8 +8,6 @@ Subject: [PATCH] /opt/Projects/openwrt/target/linux/xburst/patches-2.6.31/053-ad drivers/misc/Makefile | 1 + 2 files changed, 12 insertions(+), 0 deletions(-) -diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig -index df1f86b..d79902a 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -246,6 +246,17 @@ config EP93XX_PWM @@ -30,8 +28,6 @@ index df1f86b..d79902a 100644 source "drivers/misc/c2port/Kconfig" source "drivers/misc/eeprom/Kconfig" source "drivers/misc/cb710/Kconfig" -diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile -index f982d2e..49b6e76 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -21,5 +21,6 @@ obj-$(CONFIG_HP_ILO) += hpilo.o @@ -41,6 +37,3 @@ index f982d2e..49b6e76 100644 +obj-$(CONFIG_JZ4740_ADC) += jz4740-adc.o obj-y += eeprom/ obj-y += cb710/ --- -1.5.6.5 - diff --git a/target/linux/xburst/patches-2.6.32/100-battery.patch b/target/linux/xburst/patches-2.6.32/100-battery.patch index 5885839261..105afc22eb 100644 --- a/target/linux/xburst/patches-2.6.32/100-battery.patch +++ b/target/linux/xburst/patches-2.6.32/100-battery.patch @@ -8,8 +8,6 @@ Subject: [PATCH] /opt/Projects/openwrt/target/linux/xburst/patches-2.6.31/100-ba drivers/power/Makefile | 1 + 2 files changed, 12 insertions(+), 0 deletions(-) -diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig -index cea6cef..f10934e 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig @@ -110,4 +110,15 @@ config CHARGER_PCF50633 @@ -28,15 +26,10 @@ index cea6cef..f10934e 100644 + called jz4740-battery. + endif # POWER_SUPPLY -diff --git a/drivers/power/Makefile b/drivers/power/Makefile -index b96f29d..664d589 100644 --- a/drivers/power/Makefile +++ b/drivers/power/Makefile -@@ -29,3 +29,4 @@ obj-$(CONFIG_BATTERY_BQ27x00) += bq27x00_battery.o +@@ -29,3 +29,4 @@ obj-$(CONFIG_BATTERY_BQ27x00) += bq27x00 obj-$(CONFIG_BATTERY_DA9030) += da9030_battery.o obj-$(CONFIG_BATTERY_MAX17040) += max17040_battery.o obj-$(CONFIG_CHARGER_PCF50633) += pcf50633-charger.o +obj-$(CONFIG_BATTERY_JZ4740) += jz4740-battery.o --- -1.5.6.5 - diff --git a/target/linux/xburst/patches-2.6.32/101-mmc.patch b/target/linux/xburst/patches-2.6.32/101-mmc.patch index 2a7f2fea85..edac9df494 100644 --- a/target/linux/xburst/patches-2.6.32/101-mmc.patch +++ b/target/linux/xburst/patches-2.6.32/101-mmc.patch @@ -8,8 +8,6 @@ Subject: [PATCH] /opt/Projects/openwrt/target/linux/xburst/patches-2.6.31/101-mm drivers/mmc/host/Makefile | 1 + 2 files changed, 10 insertions(+), 0 deletions(-) -diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig -index 432ae83..16e0cb9 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -66,6 +66,15 @@ config MMC_RICOH_MMC @@ -28,8 +26,6 @@ index 432ae83..16e0cb9 100644 To compile this driver as a module, choose M here: the module will be called ricoh_mmc. -diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile -index abcb040..b5cbeb5 100644 --- a/drivers/mmc/host/Makefile +++ b/drivers/mmc/host/Makefile @@ -6,6 +6,7 @@ ifeq ($(CONFIG_MMC_DEBUG),y) @@ -40,6 +36,3 @@ index abcb040..b5cbeb5 100644 obj-$(CONFIG_MMC_ARMMMCI) += mmci.o obj-$(CONFIG_MMC_PXA) += pxamci.o obj-$(CONFIG_MMC_IMX) += imxmmc.o --- -1.5.6.5 - diff --git a/target/linux/xburst/patches-2.6.32/103-lcm.patch b/target/linux/xburst/patches-2.6.32/103-lcm.patch index e7aa59d9bb..b1f71ba2dd 100644 --- a/target/linux/xburst/patches-2.6.32/103-lcm.patch +++ b/target/linux/xburst/patches-2.6.32/103-lcm.patch @@ -8,8 +8,6 @@ Subject: [PATCH] /opt/Projects/openwrt/target/linux/xburst/patches-2.6.31/103-lc drivers/video/backlight/Makefile | 1 + 2 files changed, 8 insertions(+), 0 deletions(-) -diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig -index 09bfa96..aaca1eb 100644 --- a/drivers/video/backlight/Kconfig +++ b/drivers/video/backlight/Kconfig @@ -100,6 +100,13 @@ config LCD_HP700 @@ -26,11 +24,9 @@ index 09bfa96..aaca1eb 100644 # # Backlight # -diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile -index 9a40554..ef29baa 100644 --- a/drivers/video/backlight/Makefile +++ b/drivers/video/backlight/Makefile -@@ -10,6 +10,7 @@ obj-$(CONFIG_LCD_PLATFORM) += platform_lcd.o +@@ -10,6 +10,7 @@ obj-$(CONFIG_LCD_PLATFORM) += platfor obj-$(CONFIG_LCD_VGG2432A4) += vgg2432a4.o obj-$(CONFIG_LCD_TDO24M) += tdo24m.o obj-$(CONFIG_LCD_TOSA) += tosa_lcd.o @@ -38,6 +34,3 @@ index 9a40554..ef29baa 100644 obj-$(CONFIG_BACKLIGHT_CLASS_DEVICE) += backlight.o obj-$(CONFIG_BACKLIGHT_ATMEL_PWM) += atmel-pwm-bl.o --- -1.5.6.5 - diff --git a/target/linux/xburst/patches-2.6.32/103-serial.patch b/target/linux/xburst/patches-2.6.32/103-serial.patch index 13292d0cd2..2401248a12 100644 --- a/target/linux/xburst/patches-2.6.32/103-serial.patch +++ b/target/linux/xburst/patches-2.6.32/103-serial.patch @@ -7,11 +7,9 @@ Subject: [PATCH] /opt/Projects/openwrt/target/linux/xburst/patches-2.6.31/103-se drivers/serial/8250.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 103 insertions(+), 1 deletions(-) -diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c -index 737b4c9..65ee974 100644 --- a/drivers/serial/8250.c +++ b/drivers/serial/8250.c -@@ -196,7 +196,7 @@ static const struct serial8250_config uart_config[] = { +@@ -196,7 +196,7 @@ static const struct serial8250_config ua [PORT_16550A] = { .name = "16550A", .fifo_size = 16, @@ -20,7 +18,7 @@ index 737b4c9..65ee974 100644 .fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10, .flags = UART_CAP_FIFO, }, -@@ -403,6 +403,10 @@ static unsigned int mem_serial_in(struct uart_port *p, int offset) +@@ -403,6 +403,10 @@ static unsigned int mem_serial_in(struct static void mem_serial_out(struct uart_port *p, int offset, int value) { offset = map_8250_out_reg(p, offset) << p->regshift; @@ -31,7 +29,7 @@ index 737b4c9..65ee974 100644 writeb(value, p->membase + offset); } -@@ -2215,6 +2219,83 @@ static void serial8250_shutdown(struct uart_port *port) +@@ -2213,6 +2217,83 @@ static void serial8250_shutdown(struct u serial_unlink_irq_chain(up); } @@ -115,7 +113,7 @@ index 737b4c9..65ee974 100644 static unsigned int serial8250_get_divisor(struct uart_port *port, unsigned int baud) { unsigned int quot; -@@ -2234,6 +2315,7 @@ static unsigned int serial8250_get_divisor(struct uart_port *port, unsigned int +@@ -2232,6 +2313,7 @@ static unsigned int serial8250_get_divis return quot; } @@ -123,7 +121,7 @@ index 737b4c9..65ee974 100644 static void serial8250_set_termios(struct uart_port *port, struct ktermios *termios, -@@ -2243,6 +2325,9 @@ serial8250_set_termios(struct uart_port *port, struct ktermios *termios, +@@ -2241,6 +2323,9 @@ serial8250_set_termios(struct uart_port unsigned char cval, fcr = 0; unsigned long flags; unsigned int baud, quot; @@ -133,7 +131,7 @@ index 737b4c9..65ee974 100644 switch (termios->c_cflag & CSIZE) { case CS5: -@@ -2277,7 +2362,12 @@ serial8250_set_termios(struct uart_port *port, struct ktermios *termios, +@@ -2275,7 +2360,12 @@ serial8250_set_termios(struct uart_port baud = uart_get_baud_rate(port, termios, old, port->uartclk / 16 / 0xffff, port->uartclk / 16); @@ -146,7 +144,7 @@ index 737b4c9..65ee974 100644 /* * Oxford Semi 952 rev B workaround -@@ -2355,6 +2445,10 @@ serial8250_set_termios(struct uart_port *port, struct ktermios *termios, +@@ -2353,6 +2443,10 @@ serial8250_set_termios(struct uart_port if (up->capabilities & UART_CAP_UUE) up->ier |= UART_IER_UUE | UART_IER_RTOIE; @@ -157,7 +155,7 @@ index 737b4c9..65ee974 100644 serial_out(up, UART_IER, up->ier); if (up->capabilities & UART_CAP_EFR) { -@@ -2389,7 +2483,15 @@ serial8250_set_termios(struct uart_port *port, struct ktermios *termios, +@@ -2387,7 +2481,15 @@ serial8250_set_termios(struct uart_port serial_outp(up, UART_LCR, cval | UART_LCR_DLAB);/* set DLAB */ } @@ -173,6 +171,3 @@ index 737b4c9..65ee974 100644 /* * LCR DLAB must be set to enable 64-byte FIFO mode. If the FCR --- -1.5.6.5 - diff --git a/target/linux/xburst/patches-2.6.32/104-usb.patch b/target/linux/xburst/patches-2.6.32/104-usb.patch index dda4702491..29127b820e 100644 --- a/target/linux/xburst/patches-2.6.32/104-usb.patch +++ b/target/linux/xburst/patches-2.6.32/104-usb.patch @@ -10,8 +10,6 @@ Subject: [PATCH] /opt/Projects/openwrt/target/linux/xburst/patches-2.6.31/104-us drivers/usb/gadget/gadget_chips.h | 9 +++++++++ 4 files changed, 25 insertions(+), 0 deletions(-) -diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig -index 2407508..dac9129 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig @@ -44,6 +44,7 @@ config USB_ARCH_HAS_OHCI @@ -22,8 +20,6 @@ index 2407508..dac9129 100644 # SH: default y if CPU_SUBTYPE_SH7720 default y if CPU_SUBTYPE_SH7721 -diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig -index a18e3c5..c5c77e1 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -121,11 +121,25 @@ choice @@ -52,8 +48,6 @@ index a18e3c5..c5c77e1 100644 help Many Atmel AT91 processors (such as the AT91RM2000) have a full speed USB Device Port with support for five configurable -diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile -index 9d7b87c..cb2920e 100644 --- a/drivers/usb/gadget/Makefile +++ b/drivers/usb/gadget/Makefile @@ -28,6 +28,7 @@ obj-$(CONFIG_USB_FSL_QE) += fsl_qe_udc.o @@ -64,8 +58,6 @@ index 9d7b87c..cb2920e 100644 # # USB gadget drivers -diff --git a/drivers/usb/gadget/gadget_chips.h b/drivers/usb/gadget/gadget_chips.h -index f2d270b..369f20a 100644 --- a/drivers/usb/gadget/gadget_chips.h +++ b/drivers/usb/gadget/gadget_chips.h @@ -15,6 +15,12 @@ @@ -81,7 +73,7 @@ index f2d270b..369f20a 100644 #ifdef CONFIG_USB_GADGET_NET2280 #define gadget_is_net2280(g) !strcmp("net2280", (g)->name) #else -@@ -247,6 +253,9 @@ static inline int usb_gadget_controller_number(struct usb_gadget *gadget) +@@ -247,6 +253,9 @@ static inline int usb_gadget_controller_ return 0x24; else if (gadget_is_r8a66597(gadget)) return 0x25; @@ -91,6 +83,3 @@ index f2d270b..369f20a 100644 return -ENOENT; } --- -1.5.6.5 - diff --git a/target/linux/xburst/patches-2.6.32/105-sound.patch b/target/linux/xburst/patches-2.6.32/105-sound.patch index 7e2fd3d907..49496b5caa 100644 --- a/target/linux/xburst/patches-2.6.32/105-sound.patch +++ b/target/linux/xburst/patches-2.6.32/105-sound.patch @@ -12,8 +12,6 @@ Subject: [PATCH] /opt/Projects/openwrt/target/linux/xburst/patches-2.6.31/105-so sound/soc/codecs/Makefile | 2 ++ 6 files changed, 28 insertions(+), 16 deletions(-) -diff --git a/include/sound/pcm.h b/include/sound/pcm.h -index de6d981..6ecc22b 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h @@ -113,23 +113,23 @@ struct snd_pcm_ops { @@ -53,11 +51,9 @@ index de6d981..6ecc22b 100644 #define SNDRV_PCM_RATE_8000_48000 (SNDRV_PCM_RATE_8000_44100|SNDRV_PCM_RATE_48000) #define SNDRV_PCM_RATE_8000_96000 (SNDRV_PCM_RATE_8000_48000|SNDRV_PCM_RATE_64000|\ SNDRV_PCM_RATE_88200|SNDRV_PCM_RATE_96000) -diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c -index ab73edf..35c22d7 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c -@@ -1721,12 +1721,13 @@ static int snd_pcm_hw_rule_sample_bits(struct snd_pcm_hw_params *params, +@@ -1721,12 +1721,13 @@ static int snd_pcm_hw_rule_sample_bits(s return snd_interval_refine(hw_param_interval(params, rule->var), &t); } @@ -74,8 +70,6 @@ index ab73edf..35c22d7 100644 const struct snd_pcm_hw_constraint_list snd_pcm_known_rates = { .count = ARRAY_SIZE(rates), -diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig -index b1749bc..5a7a724 100644 --- a/sound/soc/Kconfig +++ b/sound/soc/Kconfig @@ -36,6 +36,7 @@ source "sound/soc/s3c24xx/Kconfig" @@ -86,8 +80,6 @@ index b1749bc..5a7a724 100644 # Supported codecs source "sound/soc/codecs/Kconfig" -diff --git a/sound/soc/Makefile b/sound/soc/Makefile -index 0c5eac0..8e7b5cb 100644 --- a/sound/soc/Makefile +++ b/sound/soc/Makefile @@ -14,3 +14,4 @@ obj-$(CONFIG_SND_SOC) += s3c24xx/ @@ -95,8 +87,6 @@ index 0c5eac0..8e7b5cb 100644 obj-$(CONFIG_SND_SOC) += sh/ obj-$(CONFIG_SND_SOC) += txx9/ +obj-$(CONFIG_SND_SOC) += jz4740/ -diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig -index 0edca93..cd5e44a 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -217,6 +217,13 @@ config SND_SOC_WM9712 @@ -113,8 +103,6 @@ index 0edca93..cd5e44a 100644 # Amp config SND_SOC_MAX9877 tristate -diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile -index fb4af28..d58b0fa 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -44,6 +44,7 @@ snd-soc-wm9705-objs := wm9705.o @@ -125,7 +113,7 @@ index fb4af28..d58b0fa 100644 # Amp snd-soc-max9877-objs := max9877.o -@@ -94,6 +95,7 @@ obj-$(CONFIG_SND_SOC_WM9705) += snd-soc-wm9705.o +@@ -94,6 +95,7 @@ obj-$(CONFIG_SND_SOC_WM9705) += snd-soc- obj-$(CONFIG_SND_SOC_WM9712) += snd-soc-wm9712.o obj-$(CONFIG_SND_SOC_WM9713) += snd-soc-wm9713.o obj-$(CONFIG_SND_SOC_WM_HUBS) += snd-soc-wm-hubs.o @@ -133,6 +121,3 @@ index fb4af28..d58b0fa 100644 # Amp obj-$(CONFIG_SND_SOC_MAX9877) += snd-soc-max9877.o --- -1.5.6.5 - diff --git a/target/linux/xburst/patches-2.6.32/220-add-2gb-nand-support.patch b/target/linux/xburst/patches-2.6.32/220-add-2gb-nand-support.patch index 1716a0beb0..f41a814b5e 100644 --- a/target/linux/xburst/patches-2.6.32/220-add-2gb-nand-support.patch +++ b/target/linux/xburst/patches-2.6.32/220-add-2gb-nand-support.patch @@ -7,11 +7,9 @@ Subject: [PATCH] /opt/Projects/openwrt/target/linux/xburst/patches-2.6.31/220-ad include/mtd/mtd-abi.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -diff --git a/include/mtd/mtd-abi.h b/include/mtd/mtd-abi.h -index be51ae2..cf90168 100644 --- a/include/mtd/mtd-abi.h +++ b/include/mtd/mtd-abi.h -@@ -134,7 +134,7 @@ struct nand_oobfree { +@@ -135,7 +135,7 @@ struct nand_oobfree { */ struct nand_ecclayout { __u32 eccbytes; @@ -20,6 +18,3 @@ index be51ae2..cf90168 100644 __u32 oobavail; struct nand_oobfree oobfree[MTD_MAX_OOBFREE_ENTRIES]; }; --- -1.5.6.5 - diff --git a/target/linux/xburst/patches-2.6.32/300-jffs2-summery-vmalloc.patch b/target/linux/xburst/patches-2.6.32/300-jffs2-summery-vmalloc.patch index 6658584eab..4d7334b539 100644 --- a/target/linux/xburst/patches-2.6.32/300-jffs2-summery-vmalloc.patch +++ b/target/linux/xburst/patches-2.6.32/300-jffs2-summery-vmalloc.patch @@ -7,11 +7,9 @@ Subject: [PATCH] /opt/Projects/openwrt/target/linux/xburst/patches-2.6.31/300-jf fs/jffs2/summary.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/fs/jffs2/summary.c b/fs/jffs2/summary.c -index 6caf1e1..b4882c6 100644 --- a/fs/jffs2/summary.c +++ b/fs/jffs2/summary.c -@@ -32,7 +32,7 @@ int jffs2_sum_init(struct jffs2_sb_info *c) +@@ -32,7 +32,7 @@ int jffs2_sum_init(struct jffs2_sb_info return -ENOMEM; } @@ -20,7 +18,7 @@ index 6caf1e1..b4882c6 100644 if (!c->summary->sum_buf) { JFFS2_WARNING("Can't allocate buffer for writing out summary information!\n"); -@@ -51,7 +51,7 @@ void jffs2_sum_exit(struct jffs2_sb_info *c) +@@ -51,7 +51,7 @@ void jffs2_sum_exit(struct jffs2_sb_info jffs2_sum_disable_collecting(c->summary); @@ -29,6 +27,3 @@ index 6caf1e1..b4882c6 100644 c->summary->sum_buf = NULL; kfree(c->summary); --- -1.5.6.5 - diff --git a/target/linux/xburst/patches-2.6.32/400-spi-gpio-3wire.patch b/target/linux/xburst/patches-2.6.32/400-spi-gpio-3wire.patch index dc81a67df6..fff18531c0 100644 --- a/target/linux/xburst/patches-2.6.32/400-spi-gpio-3wire.patch +++ b/target/linux/xburst/patches-2.6.32/400-spi-gpio-3wire.patch @@ -7,11 +7,9 @@ Subject: [PATCH] /opt/Projects/openwrt/target/linux/xburst/patches-2.6.31/400-sp drivers/spi/spi_gpio.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) -diff --git a/drivers/spi/spi_gpio.c b/drivers/spi/spi_gpio.c -index 26bd03e..5f89c21 100644 --- a/drivers/spi/spi_gpio.c +++ b/drivers/spi/spi_gpio.c -@@ -243,9 +243,11 @@ spi_gpio_request(struct spi_gpio_platform_data *pdata, const char *label) +@@ -254,9 +254,11 @@ spi_gpio_request(struct spi_gpio_platfor if (value) goto done; @@ -26,7 +24,7 @@ index 26bd03e..5f89c21 100644 value = spi_gpio_alloc(SPI_SCK_GPIO, label, false); if (value) -@@ -308,7 +310,8 @@ static int __init spi_gpio_probe(struct platform_device *pdev) +@@ -319,7 +321,8 @@ static int __devinit spi_gpio_probe(stru if (status < 0) { spi_master_put(spi_gpio->bitbang.master); gpio_free: @@ -36,7 +34,7 @@ index 26bd03e..5f89c21 100644 gpio_free(SPI_MOSI_GPIO); gpio_free(SPI_SCK_GPIO); spi_master_put(master); -@@ -332,7 +335,8 @@ static int __exit spi_gpio_remove(struct platform_device *pdev) +@@ -343,7 +346,8 @@ static int __devexit spi_gpio_remove(str platform_set_drvdata(pdev, NULL); @@ -46,6 +44,3 @@ index 26bd03e..5f89c21 100644 gpio_free(SPI_MOSI_GPIO); gpio_free(SPI_SCK_GPIO); --- -1.5.6.5 - diff --git a/target/linux/xburst/patches-2.6.32/420-fb-notifier-pre-post.patch b/target/linux/xburst/patches-2.6.32/420-fb-notifier-pre-post.patch index 43277062dc..9423b2cff4 100644 --- a/target/linux/xburst/patches-2.6.32/420-fb-notifier-pre-post.patch +++ b/target/linux/xburst/patches-2.6.32/420-fb-notifier-pre-post.patch @@ -7,11 +7,9 @@ Subject: [PATCH] /opt/Projects/openwrt/target/linux/xburst/patches-2.6.31/420-fb drivers/video/fbmem.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) -diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c -index 99bbd28..5e121b8 100644 --- a/drivers/video/fbmem.c +++ b/drivers/video/fbmem.c -@@ -1008,12 +1008,12 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var) +@@ -1008,12 +1008,12 @@ fb_set_var(struct fb_info *info, struct int fb_blank(struct fb_info *info, int blank) { @@ -26,7 +24,7 @@ index 99bbd28..5e121b8 100644 ret = info->fbops->fb_blank(blank, info); if (!ret) { -@@ -1024,6 +1024,10 @@ fb_blank(struct fb_info *info, int blank) +@@ -1024,6 +1024,10 @@ fb_blank(struct fb_info *info, int blank fb_notifier_call_chain(FB_EVENT_BLANK, &event); } @@ -37,6 +35,3 @@ index 99bbd28..5e121b8 100644 return ret; } --- -1.5.6.5 - diff --git a/target/linux/xburst/patches-2.6.32/500-modifier-keys.patch b/target/linux/xburst/patches-2.6.32/500-modifier-keys.patch index f14ab54e83..9a42684b74 100644 --- a/target/linux/xburst/patches-2.6.32/500-modifier-keys.patch +++ b/target/linux/xburst/patches-2.6.32/500-modifier-keys.patch @@ -7,8 +7,6 @@ Subject: [PATCH] /opt/Projects/openwrt/target/linux/xburst/patches-2.6.31/500-mo drivers/char/defkeymap.map | 74 +++++++++++++++++++++++++++++++------------- 1 files changed, 52 insertions(+), 22 deletions(-) -diff --git a/drivers/char/defkeymap.map b/drivers/char/defkeymap.map -index 50b30ca..ce141c8 100644 --- a/drivers/char/defkeymap.map +++ b/drivers/char/defkeymap.map @@ -1,5 +1,5 @@ @@ -18,7 +16,7 @@ index 50b30ca..ce141c8 100644 # Change the above line into # keymaps 0-2,4-6,8,12 # in case you want the entries -@@ -45,24 +45,38 @@ keycode 12 = minus underscore backslash +@@ -45,24 +45,38 @@ keycode 12 = minus underscor control keycode 12 = Control_underscore shift control keycode 12 = Control_underscore alt keycode 12 = Meta_minus @@ -60,7 +58,7 @@ index 50b30ca..ce141c8 100644 keycode 26 = bracketleft braceleft control keycode 26 = Escape alt keycode 26 = Meta_bracketleft -@@ -71,19 +85,28 @@ keycode 27 = bracketright braceright asciitilde +@@ -71,19 +85,28 @@ keycode 27 = bracketright bracerigh alt keycode 27 = Meta_bracketright keycode 28 = Return alt keycode 28 = Meta_Control_m @@ -93,7 +91,7 @@ index 50b30ca..ce141c8 100644 keycode 39 = semicolon colon alt keycode 39 = Meta_semicolon keycode 40 = apostrophe quotedbl -@@ -97,58 +120,65 @@ keycode 43 = backslash bar +@@ -97,58 +120,65 @@ keycode 43 = backslash bar control keycode 43 = Control_backslash alt keycode 43 = Meta_backslash keycode 44 = z @@ -181,6 +179,3 @@ index 50b30ca..ce141c8 100644 keycode 98 = KP_Divide keycode 99 = Control_backslash control keycode 99 = Control_backslash --- -1.5.6.5 - diff --git a/target/linux/xburst/patches-2.6.32/800-n526-lpc.patch b/target/linux/xburst/patches-2.6.32/800-n526-lpc.patch index 4351b833f5..df81b64ba3 100644 --- a/target/linux/xburst/patches-2.6.32/800-n526-lpc.patch +++ b/target/linux/xburst/patches-2.6.32/800-n526-lpc.patch @@ -8,8 +8,6 @@ Subject: [PATCH] /opt/Projects/openwrt/target/linux/xburst/patches-2.6.31/800-n5 drivers/i2c/chips/Makefile | 1 + 2 files changed, 10 insertions(+), 0 deletions(-) -diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig -index f9618f4..d84da61 100644 --- a/drivers/i2c/chips/Kconfig +++ b/drivers/i2c/chips/Kconfig @@ -26,4 +26,13 @@ config SENSORS_TSL2550 @@ -26,8 +24,6 @@ index f9618f4..d84da61 100644 + If you have a N526 you probably want to say Y here. + endmenu -diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile -index 749cf36..856c8b5 100644 --- a/drivers/i2c/chips/Makefile +++ b/drivers/i2c/chips/Makefile @@ -12,6 +12,7 @@ @@ -38,6 +34,3 @@ index 749cf36..856c8b5 100644 ifeq ($(CONFIG_I2C_DEBUG_CHIP),y) EXTRA_CFLAGS += -DDEBUG --- -1.5.6.5 - diff --git a/target/linux/xburst/patches-2.6.32/900-add-openwrt-logo.patch b/target/linux/xburst/patches-2.6.32/900-add-openwrt-logo.patch index 31ca2b5aae..e0ae84628f 100644 --- a/target/linux/xburst/patches-2.6.32/900-add-openwrt-logo.patch +++ b/target/linux/xburst/patches-2.6.32/900-add-openwrt-logo.patch @@ -10,8 +10,6 @@ Subject: [PATCH] /opt/Projects/openwrt/target/linux/xburst/patches-2.6.31/900-ad include/linux/linux_logo.h | 1 + 4 files changed, 10 insertions(+), 0 deletions(-) -diff --git a/drivers/video/logo/Kconfig b/drivers/video/logo/Kconfig -index 39ac49e..03da067 100644 --- a/drivers/video/logo/Kconfig +++ b/drivers/video/logo/Kconfig @@ -82,4 +82,8 @@ config LOGO_M32R_CLUT224 @@ -23,11 +21,9 @@ index 39ac49e..03da067 100644 + default y + endif # LOGO -diff --git a/drivers/video/logo/Makefile b/drivers/video/logo/Makefile -index 3b43781..cbed3a5 100644 --- a/drivers/video/logo/Makefile +++ b/drivers/video/logo/Makefile -@@ -15,6 +15,7 @@ obj-$(CONFIG_LOGO_SUPERH_MONO) += logo_superh_mono.o +@@ -15,6 +15,7 @@ obj-$(CONFIG_LOGO_SUPERH_MONO) += logo_ obj-$(CONFIG_LOGO_SUPERH_VGA16) += logo_superh_vga16.o obj-$(CONFIG_LOGO_SUPERH_CLUT224) += logo_superh_clut224.o obj-$(CONFIG_LOGO_M32R_CLUT224) += logo_m32r_clut224.o @@ -35,11 +31,9 @@ index 3b43781..cbed3a5 100644 obj-$(CONFIG_SPU_BASE) += logo_spe_clut224.o -diff --git a/drivers/video/logo/logo.c b/drivers/video/logo/logo.c -index ea7a8cc..7208830 100644 --- a/drivers/video/logo/logo.c +++ b/drivers/video/logo/logo.c -@@ -100,6 +100,10 @@ const struct linux_logo * __init_refok fb_find_logo(int depth) +@@ -100,6 +100,10 @@ const struct linux_logo * __init_refok f /* M32R Linux logo */ logo = &logo_m32r_clut224; #endif @@ -50,11 +44,9 @@ index ea7a8cc..7208830 100644 } return logo; } -diff --git a/include/linux/linux_logo.h b/include/linux/linux_logo.h -index ca5bd91..67166f3 100644 --- a/include/linux/linux_logo.h +++ b/include/linux/linux_logo.h -@@ -47,6 +47,7 @@ extern const struct linux_logo logo_superh_vga16; +@@ -47,6 +47,7 @@ extern const struct linux_logo logo_supe extern const struct linux_logo logo_superh_clut224; extern const struct linux_logo logo_m32r_clut224; extern const struct linux_logo logo_spe_clut224; @@ -9734,4 +9726,3 @@ index ca5bd91..67166f3 100644 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 - |