summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-02-08 19:36:13 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-02-08 19:36:13 +0000
commitba2e2fa7be06ce440e61837274aef416d1fc8672 (patch)
tree8bd433668a52a0fa53fee5ecb08a9913ac33aa09
parentb27747291f8ab78a69e16cbbf172443f940127c7 (diff)
[pxa] refresh 2.6.21 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14454 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/pxa/patches-2.6.21/001-pxa-regs-additions.patch6
-rw-r--r--target/linux/pxa/patches-2.6.21/002-header.patch4
-rw-r--r--target/linux/pxa/patches-2.6.21/003-arch-config.patch12
-rw-r--r--target/linux/pxa/patches-2.6.21/004-board-init.patch4
-rw-r--r--target/linux/pxa/patches-2.6.21/005-compact-flash.patch10
-rw-r--r--target/linux/pxa/patches-2.6.21/006-defconfig.patch4
-rw-r--r--target/linux/pxa/patches-2.6.21/007-flash.patch16
-rw-r--r--target/linux/pxa/patches-2.6.21/008-pxa2xx_udc.patch6
-rw-r--r--target/linux/pxa/patches-2.6.21/009-bkpxa-pxa-cpu.patch12
-rw-r--r--target/linux/pxa/patches-2.6.21/010-bkpxa-pxa-cpufreq.patch22
-rw-r--r--target/linux/pxa/patches-2.6.21/011-proc-gpio.patch4
-rw-r--r--target/linux/pxa/patches-2.6.21/012-serial-ether-addr.patch6
-rw-r--r--target/linux/pxa/patches-2.6.21/013-cpufreq-better-freqs.patch6
-rw-r--r--target/linux/pxa/patches-2.6.21/014-ethernet-config.patch6
-rw-r--r--target/linux/pxa/patches-2.6.21/015-smc-ether-addr.patch6
-rw-r--r--target/linux/pxa/patches-2.6.21/016-cpufreq-ondemand-by-default.patch12
-rw-r--r--target/linux/pxa/patches-2.6.21/017-modular-init-bluetooth.patch22
-rw-r--r--target/linux/pxa/patches-2.6.21/018-modular-init-smc91x.patch22
-rw-r--r--target/linux/pxa/patches-2.6.21/019-modular-init-usb-gadget.patch22
-rw-r--r--target/linux/pxa/patches-2.6.21/020-bugfix-i2c-include.patch6
-rw-r--r--target/linux/pxa/patches-2.6.21/021-bugfix-mmc-clock.patch6
-rw-r--r--target/linux/pxa/patches-2.6.21/022-bugfix-pxa-cpufreq.patch6
-rw-r--r--target/linux/pxa/patches-2.6.21/023-bugfix-serial-interrupt.patch6
-rw-r--r--target/linux/pxa/patches-2.6.21/024-bugfix-serial-register-status.patch6
-rw-r--r--target/linux/pxa/patches-2.6.21/025-mach-types-fix.patch6
-rw-r--r--target/linux/pxa/patches-2.6.21/026-pcm-gcc-411-bugfix.patch18
-rw-r--r--target/linux/pxa/patches-2.6.21/027-ucb1400-ac97-audio.patch12
-rw-r--r--target/linux/pxa/patches-2.6.21/028-gumstix-asoc.patch34
-rw-r--r--target/linux/pxa/patches-2.6.21/029-disable-uncompress-message.patch6
-rw-r--r--target/linux/pxa/patches-2.6.21/030-serial-divisor.patch6
-rw-r--r--target/linux/pxa/patches-2.6.21/031-mmc-card-detect.patch12
-rw-r--r--target/linux/pxa/patches-2.6.21/032-misalignment-handling.patch12
-rw-r--r--target/linux/pxa/patches-2.6.21/033-compile-fix-pxa_cpufreq.patch6
-rw-r--r--target/linux/pxa/patches-2.6.21/034-ramfs-mode-support.patch6
-rw-r--r--target/linux/pxa/patches-2.6.21/035-pxafb-definition.patch18
-rw-r--r--target/linux/pxa/patches-2.6.21/036-270-usb-gadget-udc.patch20
-rw-r--r--target/linux/pxa/patches-2.6.21/037-gumstix-pxa270-usb-host.patch30
-rw-r--r--target/linux/pxa/patches-2.6.21/038-cpufreq-fixup.patch12
-rw-r--r--target/linux/pxa/patches-2.6.21/040-pxa-regs-fixup.patch6
-rw-r--r--target/linux/pxa/patches-2.6.21/041-gumstix-fb-logo.patch6
-rw-r--r--target/linux/pxa/patches-2.6.21/042-gumstix-pxa270-mmc.patch6
-rw-r--r--target/linux/pxa/patches-2.6.21/043-pxafb-18bpp-mode.patch54
-rw-r--r--target/linux/pxa/patches-2.6.21/044-smc911x-fixup.patch34
43 files changed, 175 insertions, 361 deletions
diff --git a/target/linux/pxa/patches-2.6.21/001-pxa-regs-additions.patch b/target/linux/pxa/patches-2.6.21/001-pxa-regs-additions.patch
index f8361f41b..e6df68968 100644
--- a/target/linux/pxa/patches-2.6.21/001-pxa-regs-additions.patch
+++ b/target/linux/pxa/patches-2.6.21/001-pxa-regs-additions.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.21.7/include/asm-arm/arch-pxa/pxa-regs.h
-===================================================================
---- linux-2.6.21.7.orig/include/asm-arm/arch-pxa/pxa-regs.h
-+++ linux-2.6.21.7/include/asm-arm/arch-pxa/pxa-regs.h
+--- a/include/asm-arm/arch-pxa/pxa-regs.h
++++ b/include/asm-arm/arch-pxa/pxa-regs.h
@@ -1316,6 +1316,7 @@
#define GPIO77_LCD_ACBIAS 77 /* LCD AC Bias */
#define GPIO78_nCS_2 78 /* chip select 2 */
diff --git a/target/linux/pxa/patches-2.6.21/002-header.patch b/target/linux/pxa/patches-2.6.21/002-header.patch
index 471692517..4fa7e7a9d 100644
--- a/target/linux/pxa/patches-2.6.21/002-header.patch
+++ b/target/linux/pxa/patches-2.6.21/002-header.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.21.7/include/asm-arm/arch-pxa/gumstix.h
-===================================================================
--- /dev/null
-+++ linux-2.6.21.7/include/asm-arm/arch-pxa/gumstix.h
++++ b/include/asm-arm/arch-pxa/gumstix.h
@@ -0,0 +1,165 @@
+/*
+ * linux/include/asm-arm/arch-pxa/gumstix.h
diff --git a/target/linux/pxa/patches-2.6.21/003-arch-config.patch b/target/linux/pxa/patches-2.6.21/003-arch-config.patch
index 9b203d3a8..381be934b 100644
--- a/target/linux/pxa/patches-2.6.21/003-arch-config.patch
+++ b/target/linux/pxa/patches-2.6.21/003-arch-config.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.21.7/arch/arm/mach-pxa/Kconfig
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/mach-pxa/Kconfig
-+++ linux-2.6.21.7/arch/arm/mach-pxa/Kconfig
+--- a/arch/arm/mach-pxa/Kconfig
++++ b/arch/arm/mach-pxa/Kconfig
@@ -5,6 +5,10 @@ menu "Intel PXA2xx Implementations"
choice
prompt "Select target board"
@@ -48,10 +46,8 @@ Index: linux-2.6.21.7/arch/arm/mach-pxa/Kconfig
config PXA25x
bool
help
-Index: linux-2.6.21.7/arch/arm/mach-pxa/Makefile
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/mach-pxa/Makefile
-+++ linux-2.6.21.7/arch/arm/mach-pxa/Makefile
+--- a/arch/arm/mach-pxa/Makefile
++++ b/arch/arm/mach-pxa/Makefile
@@ -8,6 +8,7 @@ obj-$(CONFIG_PXA25x) += pxa25x.o
obj-$(CONFIG_PXA27x) += pxa27x.o
diff --git a/target/linux/pxa/patches-2.6.21/004-board-init.patch b/target/linux/pxa/patches-2.6.21/004-board-init.patch
index d96c9811a..ebf37e7f6 100644
--- a/target/linux/pxa/patches-2.6.21/004-board-init.patch
+++ b/target/linux/pxa/patches-2.6.21/004-board-init.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.21.7/arch/arm/mach-pxa/gumstix.c
-===================================================================
--- /dev/null
-+++ linux-2.6.21.7/arch/arm/mach-pxa/gumstix.c
++++ b/arch/arm/mach-pxa/gumstix.c
@@ -0,0 +1,76 @@
+/*
+ * linux/arch/arm/mach-pxa/gumstix.c
diff --git a/target/linux/pxa/patches-2.6.21/005-compact-flash.patch b/target/linux/pxa/patches-2.6.21/005-compact-flash.patch
index d866555f3..6143fc69d 100644
--- a/target/linux/pxa/patches-2.6.21/005-compact-flash.patch
+++ b/target/linux/pxa/patches-2.6.21/005-compact-flash.patch
@@ -1,17 +1,13 @@
-Index: linux-2.6.21.7/drivers/pcmcia/Makefile
-===================================================================
---- linux-2.6.21.7.orig/drivers/pcmcia/Makefile
-+++ linux-2.6.21.7/drivers/pcmcia/Makefile
+--- a/drivers/pcmcia/Makefile
++++ b/drivers/pcmcia/Makefile
@@ -69,4 +69,4 @@ sa1100_cs-$(CONFIG_SA1100_SIMPAD) += sa
pxa2xx_cs-$(CONFIG_ARCH_LUBBOCK) += pxa2xx_lubbock.o sa1111_generic.o
pxa2xx_cs-$(CONFIG_MACH_MAINSTONE) += pxa2xx_mainstone.o
pxa2xx_cs-$(CONFIG_PXA_SHARPSL) += pxa2xx_sharpsl.o
-
+pxa2xx_cs-$(CONFIG_ARCH_GUMSTIX) += pxa2xx_gumstix.o
-Index: linux-2.6.21.7/drivers/pcmcia/pxa2xx_gumstix.c
-===================================================================
--- /dev/null
-+++ linux-2.6.21.7/drivers/pcmcia/pxa2xx_gumstix.c
++++ b/drivers/pcmcia/pxa2xx_gumstix.c
@@ -0,0 +1,272 @@
+/*
+ * linux/drivers/pcmcia/pxa2xx_gumstix.c
diff --git a/target/linux/pxa/patches-2.6.21/006-defconfig.patch b/target/linux/pxa/patches-2.6.21/006-defconfig.patch
index 3d9dc5cfc..472e5fd52 100644
--- a/target/linux/pxa/patches-2.6.21/006-defconfig.patch
+++ b/target/linux/pxa/patches-2.6.21/006-defconfig.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.21.7/arch/arm/configs/gumstix_defconfig
-===================================================================
--- /dev/null
-+++ linux-2.6.21.7/arch/arm/configs/gumstix_defconfig
++++ b/arch/arm/configs/gumstix_defconfig
@@ -0,0 +1,761 @@
+#
+# Automatically generated make config: don't edit
diff --git a/target/linux/pxa/patches-2.6.21/007-flash.patch b/target/linux/pxa/patches-2.6.21/007-flash.patch
index 3d4df0952..3d091b276 100644
--- a/target/linux/pxa/patches-2.6.21/007-flash.patch
+++ b/target/linux/pxa/patches-2.6.21/007-flash.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.21.7/drivers/mtd/maps/gumstix-flash.c
-===================================================================
--- /dev/null
-+++ linux-2.6.21.7/drivers/mtd/maps/gumstix-flash.c
++++ b/drivers/mtd/maps/gumstix-flash.c
@@ -0,0 +1,136 @@
+/*
+ * Map driver for the Gumstix platform
@@ -139,10 +137,8 @@ Index: linux-2.6.21.7/drivers/mtd/maps/gumstix-flash.c
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Gumstix, Inc. <gumstix-users@lists.sf.net>");
+MODULE_DESCRIPTION("MTD map driver for the Gumstix Platform");
-Index: linux-2.6.21.7/drivers/mtd/maps/Kconfig
-===================================================================
---- linux-2.6.21.7.orig/drivers/mtd/maps/Kconfig
-+++ linux-2.6.21.7/drivers/mtd/maps/Kconfig
+--- a/drivers/mtd/maps/Kconfig
++++ b/drivers/mtd/maps/Kconfig
@@ -131,6 +131,13 @@ config MTD_SBC_GXX
More info at
<http://www.arcomcontrols.com/products/icp/pc104/processors/SBC_GX1.htm>.
@@ -157,10 +153,8 @@ Index: linux-2.6.21.7/drivers/mtd/maps/Kconfig
config MTD_LUBBOCK
tristate "CFI Flash device mapped on Intel Lubbock XScale eval board"
depends on ARCH_LUBBOCK && MTD_CFI_INTELEXT && MTD_PARTITIONS
-Index: linux-2.6.21.7/drivers/mtd/maps/Makefile
-===================================================================
---- linux-2.6.21.7.orig/drivers/mtd/maps/Makefile
-+++ linux-2.6.21.7/drivers/mtd/maps/Makefile
+--- a/drivers/mtd/maps/Makefile
++++ b/drivers/mtd/maps/Makefile
@@ -21,6 +21,7 @@ obj-$(CONFIG_MTD_ICHXROM) += ichxrom.o
obj-$(CONFIG_MTD_CK804XROM) += ck804xrom.o
obj-$(CONFIG_MTD_TSUNAMI) += tsunami_flash.o
diff --git a/target/linux/pxa/patches-2.6.21/008-pxa2xx_udc.patch b/target/linux/pxa/patches-2.6.21/008-pxa2xx_udc.patch
index bfb799755..51c413318 100644
--- a/target/linux/pxa/patches-2.6.21/008-pxa2xx_udc.patch
+++ b/target/linux/pxa/patches-2.6.21/008-pxa2xx_udc.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.21.7/drivers/usb/gadget/pxa2xx_udc.c
-===================================================================
---- linux-2.6.21.7.orig/drivers/usb/gadget/pxa2xx_udc.c
-+++ linux-2.6.21.7/drivers/usb/gadget/pxa2xx_udc.c
+--- a/drivers/usb/gadget/pxa2xx_udc.c
++++ b/drivers/usb/gadget/pxa2xx_udc.c
@@ -51,6 +51,7 @@
#include <asm/mach-types.h>
#include <asm/unaligned.h>
diff --git a/target/linux/pxa/patches-2.6.21/009-bkpxa-pxa-cpu.patch b/target/linux/pxa/patches-2.6.21/009-bkpxa-pxa-cpu.patch
index ce9e6a1ad..72480612c 100644
--- a/target/linux/pxa/patches-2.6.21/009-bkpxa-pxa-cpu.patch
+++ b/target/linux/pxa/patches-2.6.21/009-bkpxa-pxa-cpu.patch
@@ -10,10 +10,8 @@ from hh.org-cvs:
# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
#
-Index: linux-2.6.21.7/arch/arm/mm/proc-xscale.S
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/mm/proc-xscale.S
-+++ linux-2.6.21.7/arch/arm/mm/proc-xscale.S
+--- a/arch/arm/mm/proc-xscale.S
++++ b/arch/arm/mm/proc-xscale.S
@@ -474,11 +474,62 @@ ENTRY(cpu_xscale_set_pte_ext)
movne r2, #0 @ no -> fault
@@ -77,10 +75,8 @@ Index: linux-2.6.21.7/arch/arm/mm/proc-xscale.S
.ltorg
-Index: linux-2.6.21.7/include/asm-arm/arch-pxa/pxa-regs.h
-===================================================================
---- linux-2.6.21.7.orig/include/asm-arm/arch-pxa/pxa-regs.h
-+++ linux-2.6.21.7/include/asm-arm/arch-pxa/pxa-regs.h
+--- a/include/asm-arm/arch-pxa/pxa-regs.h
++++ b/include/asm-arm/arch-pxa/pxa-regs.h
@@ -1345,6 +1345,7 @@
#define GPIO_ALT_FN_2_OUT 0x280
#define GPIO_ALT_FN_3_IN 0x300
diff --git a/target/linux/pxa/patches-2.6.21/010-bkpxa-pxa-cpufreq.patch b/target/linux/pxa/patches-2.6.21/010-bkpxa-pxa-cpufreq.patch
index 0ee3533de..f523c721a 100644
--- a/target/linux/pxa/patches-2.6.21/010-bkpxa-pxa-cpufreq.patch
+++ b/target/linux/pxa/patches-2.6.21/010-bkpxa-pxa-cpufreq.patch
@@ -6,10 +6,8 @@ added mods from Stefan Eletzhofer and Lothar Weissmann
# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
#
-Index: linux-2.6.21.7/arch/arm/Kconfig
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/Kconfig
-+++ linux-2.6.21.7/arch/arm/Kconfig
+--- a/arch/arm/Kconfig
++++ b/arch/arm/Kconfig
@@ -800,7 +800,7 @@ config KEXEC
endmenu
@@ -32,10 +30,8 @@ Index: linux-2.6.21.7/arch/arm/Kconfig
endif
menu "Floating point emulation"
-Index: linux-2.6.21.7/arch/arm/mach-pxa/Makefile
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/mach-pxa/Makefile
-+++ linux-2.6.21.7/arch/arm/mach-pxa/Makefile
+--- a/arch/arm/mach-pxa/Makefile
++++ b/arch/arm/mach-pxa/Makefile
@@ -32,6 +32,7 @@ obj-$(CONFIG_LEDS) += $(led-y)
# Misc features
obj-$(CONFIG_PM) += pm.o sleep.o
@@ -44,10 +40,8 @@ Index: linux-2.6.21.7/arch/arm/mach-pxa/Makefile
ifeq ($(CONFIG_PXA27x),y)
obj-$(CONFIG_PM) += standby.o
-Index: linux-2.6.21.7/arch/arm/mach-pxa/cpu-pxa.c
-===================================================================
--- /dev/null
-+++ linux-2.6.21.7/arch/arm/mach-pxa/cpu-pxa.c
++++ b/arch/arm/mach-pxa/cpu-pxa.c
@@ -0,0 +1,321 @@
+/*
+ * linux/arch/arm/mach-pxa/cpu-pxa.c
@@ -370,10 +364,8 @@ Index: linux-2.6.21.7/arch/arm/mach-pxa/cpu-pxa.c
+module_init(pxa_cpu_init);
+module_exit(pxa_cpu_exit);
+
-Index: linux-2.6.21.7/Documentation/cpu-freq/user-guide.txt
-===================================================================
---- linux-2.6.21.7.orig/Documentation/cpu-freq/user-guide.txt
-+++ linux-2.6.21.7/Documentation/cpu-freq/user-guide.txt
+--- a/Documentation/cpu-freq/user-guide.txt
++++ b/Documentation/cpu-freq/user-guide.txt
@@ -18,7 +18,7 @@
Contents:
---------
diff --git a/target/linux/pxa/patches-2.6.21/011-proc-gpio.patch b/target/linux/pxa/patches-2.6.21/011-proc-gpio.patch
index 479a070b5..9085a48ac 100644
--- a/target/linux/pxa/patches-2.6.21/011-proc-gpio.patch
+++ b/target/linux/pxa/patches-2.6.21/011-proc-gpio.patch
@@ -1,6 +1,6 @@
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
-@@ -505,6 +505,8 @@
+@@ -505,6 +505,8 @@ config PCI_HOST_VIA82C505
depends on PCI && ARCH_SHARK
default y
@@ -11,7 +11,7 @@
source "drivers/pcmcia/Kconfig"
--- a/drivers/Makefile
+++ b/drivers/Makefile
-@@ -81,3 +81,4 @@
+@@ -81,3 +81,4 @@ obj-$(CONFIG_GENERIC_TIME) += clocksourc
obj-$(CONFIG_DMA_ENGINE) += dma/
obj-$(CONFIG_HID) += hid/
obj-$(CONFIG_PPC_PS3) += ps3/
diff --git a/target/linux/pxa/patches-2.6.21/012-serial-ether-addr.patch b/target/linux/pxa/patches-2.6.21/012-serial-ether-addr.patch
index 93535fa47..7fdbebe5a 100644
--- a/target/linux/pxa/patches-2.6.21/012-serial-ether-addr.patch
+++ b/target/linux/pxa/patches-2.6.21/012-serial-ether-addr.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.21.7/drivers/usb/gadget/ether.c
-===================================================================
---- linux-2.6.21.7.orig/drivers/usb/gadget/ether.c
-+++ linux-2.6.21.7/drivers/usb/gadget/ether.c
+--- a/drivers/usb/gadget/ether.c
++++ b/drivers/usb/gadget/ether.c
@@ -2249,6 +2249,38 @@ static u8 __devinit nibble (unsigned cha
return 0;
}
diff --git a/target/linux/pxa/patches-2.6.21/013-cpufreq-better-freqs.patch b/target/linux/pxa/patches-2.6.21/013-cpufreq-better-freqs.patch
index 829f75cdc..89a9fa37b 100644
--- a/target/linux/pxa/patches-2.6.21/013-cpufreq-better-freqs.patch
+++ b/target/linux/pxa/patches-2.6.21/013-cpufreq-better-freqs.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.21.7/arch/arm/mach-pxa/cpu-pxa.c
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/mach-pxa/cpu-pxa.c
-+++ linux-2.6.21.7/arch/arm/mach-pxa/cpu-pxa.c
+--- a/arch/arm/mach-pxa/cpu-pxa.c
++++ b/arch/arm/mach-pxa/cpu-pxa.c
@@ -65,8 +65,8 @@ typedef struct
#define CCLKCFG_TURBO 0x1
diff --git a/target/linux/pxa/patches-2.6.21/014-ethernet-config.patch b/target/linux/pxa/patches-2.6.21/014-ethernet-config.patch
index de0d031d5..be38f03f7 100644
--- a/target/linux/pxa/patches-2.6.21/014-ethernet-config.patch
+++ b/target/linux/pxa/patches-2.6.21/014-ethernet-config.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.21.7/drivers/net/smc91x.h
-===================================================================
---- linux-2.6.21.7.orig/drivers/net/smc91x.h
-+++ linux-2.6.21.7/drivers/net/smc91x.h
+--- a/drivers/net/smc91x.h
++++ b/drivers/net/smc91x.h
@@ -55,6 +55,21 @@
#define SMC_insw(a, r, p, l) readsw((a) + (r), p, l)
#define SMC_outsw(a, r, p, l) writesw((a) + (r), p, l)
diff --git a/target/linux/pxa/patches-2.6.21/015-smc-ether-addr.patch b/target/linux/pxa/patches-2.6.21/015-smc-ether-addr.patch
index e45c4668c..285a8f080 100644
--- a/target/linux/pxa/patches-2.6.21/015-smc-ether-addr.patch
+++ b/target/linux/pxa/patches-2.6.21/015-smc-ether-addr.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.21.7/drivers/net/smc91x.c
-===================================================================
---- linux-2.6.21.7.orig/drivers/net/smc91x.c
-+++ linux-2.6.21.7/drivers/net/smc91x.c
+--- a/drivers/net/smc91x.c
++++ b/drivers/net/smc91x.c
@@ -1815,6 +1815,39 @@ static int __init smc_findirq(void __iom
return probe_irq_off(cookie);
}
diff --git a/target/linux/pxa/patches-2.6.21/016-cpufreq-ondemand-by-default.patch b/target/linux/pxa/patches-2.6.21/016-cpufreq-ondemand-by-default.patch
index dba8d9f03..78d99f2bc 100644
--- a/target/linux/pxa/patches-2.6.21/016-cpufreq-ondemand-by-default.patch
+++ b/target/linux/pxa/patches-2.6.21/016-cpufreq-ondemand-by-default.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.21.7/drivers/cpufreq/Kconfig
-===================================================================
---- linux-2.6.21.7.orig/drivers/cpufreq/Kconfig
-+++ linux-2.6.21.7/drivers/cpufreq/Kconfig
+--- a/drivers/cpufreq/Kconfig
++++ b/drivers/cpufreq/Kconfig
@@ -52,7 +52,7 @@ config CPU_FREQ_STAT_DETAILS
choice
@@ -26,10 +24,8 @@ Index: linux-2.6.21.7/drivers/cpufreq/Kconfig
endchoice
config CPU_FREQ_GOV_PERFORMANCE
-Index: linux-2.6.21.7/include/linux/cpufreq.h
-===================================================================
---- linux-2.6.21.7.orig/include/linux/cpufreq.h
-+++ linux-2.6.21.7/include/linux/cpufreq.h
+--- a/include/linux/cpufreq.h
++++ b/include/linux/cpufreq.h
@@ -286,6 +286,9 @@ extern struct cpufreq_governor cpufreq_g
#elif defined(CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE)
extern struct cpufreq_governor cpufreq_gov_userspace;
diff --git a/target/linux/pxa/patches-2.6.21/017-modular-init-bluetooth.patch b/target/linux/pxa/patches-2.6.21/017-modular-init-bluetooth.patch
index 108a4ca8e..306cc8e8e 100644
--- a/target/linux/pxa/patches-2.6.21/017-modular-init-bluetooth.patch
+++ b/target/linux/pxa/patches-2.6.21/017-modular-init-bluetooth.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.21.7/net/bluetooth/Kconfig
-===================================================================
---- linux-2.6.21.7.orig/net/bluetooth/Kconfig
-+++ linux-2.6.21.7/net/bluetooth/Kconfig
+--- a/net/bluetooth/Kconfig
++++ b/net/bluetooth/Kconfig
@@ -30,6 +30,12 @@ menuconfig BT
Bluetooth kernel modules are provided in the BlueZ packages.
For more information, see <http://www.bluez.org/>.
@@ -15,10 +13,8 @@ Index: linux-2.6.21.7/net/bluetooth/Kconfig
config BT_L2CAP
tristate "L2CAP protocol support"
depends on BT
-Index: linux-2.6.21.7/net/bluetooth/Makefile
-===================================================================
---- linux-2.6.21.7.orig/net/bluetooth/Makefile
-+++ linux-2.6.21.7/net/bluetooth/Makefile
+--- a/net/bluetooth/Makefile
++++ b/net/bluetooth/Makefile
@@ -9,5 +9,6 @@ obj-$(CONFIG_BT_RFCOMM) += rfcomm/
obj-$(CONFIG_BT_BNEP) += bnep/
obj-$(CONFIG_BT_CMTP) += cmtp/
@@ -26,10 +22,8 @@ Index: linux-2.6.21.7/net/bluetooth/Makefile
+obj-$(CONFIG_BT_GUMSTIX)+= gumstix_bluetooth.o
bluetooth-objs := af_bluetooth.o hci_core.o hci_conn.o hci_event.o hci_sock.o hci_sysfs.o lib.o
-Index: linux-2.6.21.7/net/bluetooth/af_bluetooth.c
-===================================================================
---- linux-2.6.21.7.orig/net/bluetooth/af_bluetooth.c
-+++ linux-2.6.21.7/net/bluetooth/af_bluetooth.c
+--- a/net/bluetooth/af_bluetooth.c
++++ b/net/bluetooth/af_bluetooth.c
@@ -327,12 +327,20 @@ static struct net_proto_family bt_sock_f
.create = bt_sock_create,
};
@@ -51,10 +45,8 @@ Index: linux-2.6.21.7/net/bluetooth/af_bluetooth.c
err = bt_sysfs_init();
if (err < 0)
return err;
-Index: linux-2.6.21.7/net/bluetooth/gumstix_bluetooth.c
-===================================================================
--- /dev/null
-+++ linux-2.6.21.7/net/bluetooth/gumstix_bluetooth.c
++++ b/net/bluetooth/gumstix_bluetooth.c
@@ -0,0 +1,50 @@
+/*
+ * Gumstix bluetooth module intialization driver
diff --git a/target/linux/pxa/patches-2.6.21/018-modular-init-smc91x.patch b/target/linux/pxa/patches-2.6.21/018-modular-init-smc91x.patch
index 9e04f13db..993f30b41 100644
--- a/target/linux/pxa/patches-2.6.21/018-modular-init-smc91x.patch
+++ b/target/linux/pxa/patches-2.6.21/018-modular-init-smc91x.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.21.7/drivers/net/Kconfig
-===================================================================
---- linux-2.6.21.7.orig/drivers/net/Kconfig
-+++ linux-2.6.21.7/drivers/net/Kconfig
+--- a/drivers/net/Kconfig
++++ b/drivers/net/Kconfig
@@ -959,6 +959,12 @@ config SMC91X
module, say M here and read <file:Documentation/modules.txt> as well
as <file:Documentation/networking/net-modules.txt>.
@@ -15,10 +13,8 @@ Index: linux-2.6.21.7/drivers/net/Kconfig
config SMC9194
tristate "SMC 9194 support"
depends on NET_VENDOR_SMC && (ISA || MAC && BROKEN)
-Index: linux-2.6.21.7/drivers/net/Makefile
-===================================================================
---- linux-2.6.21.7.orig/drivers/net/Makefile
-+++ linux-2.6.21.7/drivers/net/Makefile
+--- a/drivers/net/Makefile
++++ b/drivers/net/Makefile
@@ -201,6 +201,7 @@ obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o
obj-$(CONFIG_MACB) += macb.o
@@ -27,10 +23,8 @@ Index: linux-2.6.21.7/drivers/net/Makefile
obj-$(CONFIG_ARM) += arm/
obj-$(CONFIG_DEV_APPLETALK) += appletalk/
obj-$(CONFIG_TR) += tokenring/
-Index: linux-2.6.21.7/drivers/net/smc91x.c
-===================================================================
---- linux-2.6.21.7.orig/drivers/net/smc91x.c
-+++ linux-2.6.21.7/drivers/net/smc91x.c
+--- a/drivers/net/smc91x.c
++++ b/drivers/net/smc91x.c
@@ -2373,6 +2373,10 @@ static struct platform_driver smc_driver
},
};
@@ -53,10 +47,8 @@ Index: linux-2.6.21.7/drivers/net/smc91x.c
return platform_driver_register(&smc_driver);
}
-Index: linux-2.6.21.7/drivers/net/gumstix-smc91x.c
-===================================================================
--- /dev/null
-+++ linux-2.6.21.7/drivers/net/gumstix-smc91x.c
++++ b/drivers/net/gumstix-smc91x.c
@@ -0,0 +1,143 @@
+/*
+ * Gumstix SMC91C111 chip intialization driver
diff --git a/target/linux/pxa/patches-2.6.21/019-modular-init-usb-gadget.patch b/target/linux/pxa/patches-2.6.21/019-modular-init-usb-gadget.patch
index e24e93aa1..e0017934f 100644
--- a/target/linux/pxa/patches-2.6.21/019-modular-init-usb-gadget.patch
+++ b/target/linux/pxa/patches-2.6.21/019-modular-init-usb-gadget.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.21.7/drivers/usb/gadget/Kconfig
-===================================================================
---- linux-2.6.21.7.orig/drivers/usb/gadget/Kconfig
-+++ linux-2.6.21.7/drivers/usb/gadget/Kconfig
+--- a/drivers/usb/gadget/Kconfig
++++ b/drivers/usb/gadget/Kconfig
@@ -56,6 +56,14 @@ config USB_GADGET_DEBUG_FILES
config USB_GADGET_SELECTED
boolean
@@ -17,10 +15,8 @@ Index: linux-2.6.21.7/drivers/usb/gadget/Kconfig
#
# USB Peripheral Controller Support
#
-Index: linux-2.6.21.7/drivers/usb/gadget/Makefile
-===================================================================
---- linux-2.6.21.7.orig/drivers/usb/gadget/Makefile
-+++ linux-2.6.21.7/drivers/usb/gadget/Makefile
+--- a/drivers/usb/gadget/Makefile
++++ b/drivers/usb/gadget/Makefile
@@ -8,6 +8,7 @@ obj-$(CONFIG_USB_GOKU) += goku_udc.o
obj-$(CONFIG_USB_OMAP) += omap_udc.o
obj-$(CONFIG_USB_LH7A40X) += lh7a40x_udc.o
@@ -29,10 +25,8 @@ Index: linux-2.6.21.7/drivers/usb/gadget/Makefile
#
# USB gadget drivers
-Index: linux-2.6.21.7/drivers/usb/gadget/pxa2xx_udc.c
-===================================================================
---- linux-2.6.21.7.orig/drivers/usb/gadget/pxa2xx_udc.c
-+++ linux-2.6.21.7/drivers/usb/gadget/pxa2xx_udc.c
+--- a/drivers/usb/gadget/pxa2xx_udc.c
++++ b/drivers/usb/gadget/pxa2xx_udc.c
@@ -2752,8 +2752,16 @@ static struct platform_driver udc_driver
},
};
@@ -50,10 +44,8 @@ Index: linux-2.6.21.7/drivers/usb/gadget/pxa2xx_udc.c
printk(KERN_INFO "%s: version %s\n", driver_name, DRIVER_VERSION);
return platform_driver_register(&udc_driver);
}
-Index: linux-2.6.21.7/drivers/usb/gadget/gumstix_gadget.c
-===================================================================
--- /dev/null
-+++ linux-2.6.21.7/drivers/usb/gadget/gumstix_gadget.c
++++ b/drivers/usb/gadget/gumstix_gadget.c
@@ -0,0 +1,49 @@
+/*
+ * Gumstix USB gadget intialization driver
diff --git a/target/linux/pxa/patches-2.6.21/020-bugfix-i2c-include.patch b/target/linux/pxa/patches-2.6.21/020-bugfix-i2c-include.patch
index fea6a938e..5947e7df7 100644
--- a/target/linux/pxa/patches-2.6.21/020-bugfix-i2c-include.patch
+++ b/target/linux/pxa/patches-2.6.21/020-bugfix-i2c-include.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.21.7/drivers/i2c/busses/i2c-pxa.c
-===================================================================
---- linux-2.6.21.7.orig/drivers/i2c/busses/i2c-pxa.c
-+++ linux-2.6.21.7/drivers/i2c/busses/i2c-pxa.c
+--- a/drivers/i2c/busses/i2c-pxa.c
++++ b/drivers/i2c/busses/i2c-pxa.c
@@ -32,6 +32,7 @@
#include <linux/i2c-pxa.h>
#include <linux/platform_device.h>
diff --git a/target/linux/pxa/patches-2.6.21/021-bugfix-mmc-clock.patch b/target/linux/pxa/patches-2.6.21/021-bugfix-mmc-clock.patch
index 9fc6d1984..d97997605 100644
--- a/target/linux/pxa/patches-2.6.21/021-bugfix-mmc-clock.patch
+++ b/target/linux/pxa/patches-2.6.21/021-bugfix-mmc-clock.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.21.7/drivers/mmc/pxamci.c
-===================================================================
---- linux-2.6.21.7.orig/drivers/mmc/pxamci.c
-+++ linux-2.6.21.7/drivers/mmc/pxamci.c
+--- a/drivers/mmc/pxamci.c
++++ b/drivers/mmc/pxamci.c
@@ -366,8 +366,7 @@ static void pxamci_set_ios(struct mmc_ho
if (ios->clock) {
diff --git a/target/linux/pxa/patches-2.6.21/022-bugfix-pxa-cpufreq.patch b/target/linux/pxa/patches-2.6.21/022-bugfix-pxa-cpufreq.patch
index 2776e85bb..c2397759a 100644
--- a/target/linux/pxa/patches-2.6.21/022-bugfix-pxa-cpufreq.patch
+++ b/target/linux/pxa/patches-2.6.21/022-bugfix-pxa-cpufreq.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.21.7/arch/arm/mach-pxa/cpu-pxa.c
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/mach-pxa/cpu-pxa.c
-+++ linux-2.6.21.7/arch/arm/mach-pxa/cpu-pxa.c
+--- a/arch/arm/mach-pxa/cpu-pxa.c
++++ b/arch/arm/mach-pxa/cpu-pxa.c
@@ -60,7 +60,7 @@ typedef struct
/* Define the refresh period in mSec for the SDRAM and the number of rows */
diff --git a/target/linux/pxa/patches-2.6.21/023-bugfix-serial-interrupt.patch b/target/linux/pxa/patches-2.6.21/023-bugfix-serial-interrupt.patch
index 042aa0241..ba0337160 100644
--- a/target/linux/pxa/patches-2.6.21/023-bugfix-serial-interrupt.patch
+++ b/target/linux/pxa/patches-2.6.21/023-bugfix-serial-interrupt.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.21.7/drivers/serial/pxa.c
-===================================================================
---- linux-2.6.21.7.orig/drivers/serial/pxa.c
-+++ linux-2.6.21.7/drivers/serial/pxa.c
+--- a/drivers/serial/pxa.c
++++ b/drivers/serial/pxa.c
@@ -235,15 +235,19 @@ static inline irqreturn_t serial_pxa_irq
struct uart_pxa_port *up = dev_id;
unsigned int iir, lsr;
diff --git a/target/linux/pxa/patches-2.6.21/024-bugfix-serial-register-status.patch b/target/linux/pxa/patches-2.6.21/024-bugfix-serial-register-status.patch
index 46111d55d..da1597280 100644
--- a/target/linux/pxa/patches-2.6.21/024-bugfix-serial-register-status.patch
+++ b/target/linux/pxa/patches-2.6.21/024-bugfix-serial-register-status.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.21.7/drivers/serial/pxa.c
-===================================================================
---- linux-2.6.21.7.orig/drivers/serial/pxa.c
-+++ linux-2.6.21.7/drivers/serial/pxa.c
+--- a/drivers/serial/pxa.c
++++ b/drivers/serial/pxa.c
@@ -57,6 +57,8 @@ struct uart_pxa_port {
unsigned int lsr_break_flag;
unsigned int cken;
diff --git a/target/linux/pxa/patches-2.6.21/025-mach-types-fix.patch b/target/linux/pxa/patches-2.6.21/025-mach-types-fix.patch
index faf04a4c4..34d56ba3b 100644
--- a/target/linux/pxa/patches-2.6.21/025-mach-types-fix.patch
+++ b/target/linux/pxa/patches-2.6.21/025-mach-types-fix.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.21.7/arch/arm/tools/mach-types
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/tools/mach-types
-+++ linux-2.6.21.7/arch/arm/tools/mach-types
+--- a/arch/arm/tools/mach-types
++++ b/arch/arm/tools/mach-types
@@ -387,7 +387,7 @@ s5c7375 ARCH_S5C7375 S5C7375 369
spearhead ARCH_SPEARHEAD SPEARHEAD 370
pantera ARCH_PANTERA PANTERA 371
diff --git a/target/linux/pxa/patches-2.6.21/026-pcm-gcc-411-bugfix.patch b/target/linux/pxa/patches-2.6.21/026-pcm-gcc-411-bugfix.patch
index 2bfdffe1b..e7d8a10b7 100644
--- a/target/linux/pxa/patches-2.6.21/026-pcm-gcc-411-bugfix.patch
+++ b/target/linux/pxa/patches-2.6.21/026-pcm-gcc-411-bugfix.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.21.7/include/sound/pcm_params.h
-===================================================================
---- linux-2.6.21.7.orig/include/sound/pcm_params.h
-+++ linux-2.6.21.7/include/sound/pcm_params.h
+--- a/include/sound/pcm_params.h
++++ b/include/sound/pcm_params.h
@@ -179,16 +179,8 @@ static inline int snd_mask_single(const
return 1;
}
@@ -21,10 +19,8 @@ Index: linux-2.6.21.7/include/sound/pcm_params.h
static inline int snd_mask_refine_first(struct snd_mask *mask)
{
-Index: linux-2.6.21.7/sound/core/pcm_lib.c
-===================================================================
---- linux-2.6.21.7.orig/sound/core/pcm_lib.c
-+++ linux-2.6.21.7/sound/core/pcm_lib.c
+--- a/sound/core/pcm_lib.c
++++ b/sound/core/pcm_lib.c
@@ -2128,3 +2128,18 @@ snd_pcm_sframes_t snd_pcm_lib_readv(stru
}
@@ -44,10 +40,8 @@ Index: linux-2.6.21.7/sound/core/pcm_lib.c
+}
+
+EXPORT_SYMBOL(snd_mask_refine);
-Index: linux-2.6.21.7/sound/core/pcm_native.c
-===================================================================
---- linux-2.6.21.7.orig/sound/core/pcm_native.c
-+++ linux-2.6.21.7/sound/core/pcm_native.c
+--- a/sound/core/pcm_native.c
++++ b/sound/core/pcm_native.c
@@ -3450,3 +3450,9 @@ const struct file_operations snd_pcm_f_o
.fasync = snd_pcm_fasync,
}
diff --git a/target/linux/pxa/patches-2.6.21/027-ucb1400-ac97-audio.patch b/target/linux/pxa/patches-2.6.21/027-ucb1400-ac97-audio.patch
index b6b965ab1..e1686da2b 100644
--- a/target/linux/pxa/patches-2.6.21/027-ucb1400-ac97-audio.patch
+++ b/target/linux/pxa/patches-2.6.21/027-ucb1400-ac97-audio.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.21.7/sound/pci/ac97/ac97_codec.c
-===================================================================
---- linux-2.6.21.7.orig/sound/pci/ac97/ac97_codec.c
-+++ linux-2.6.21.7/sound/pci/ac97/ac97_codec.c
+--- a/sound/pci/ac97/ac97_codec.c
++++ b/sound/pci/ac97/ac97_codec.c
@@ -158,7 +158,7 @@ static const struct ac97_codec_id snd_ac
{ 0x4e534300, 0xffffffff, "LM4540,43,45,46,48", NULL, NULL }, // only guess --jk
{ 0x4e534331, 0xffffffff, "LM4549", NULL, NULL },
@@ -11,10 +9,8 @@ Index: linux-2.6.21.7/sound/pci/ac97/ac97_codec.c
{ 0x53494c20, 0xffffffe0, "Si3036,8", mpatch_si3036, mpatch_si3036, AC97_MODEM_PATCH },
{ 0x54524102, 0xffffffff, "TR28022", NULL, NULL },
{ 0x54524106, 0xffffffff, "TR28026", NULL, NULL },
-Index: linux-2.6.21.7/sound/pci/ac97/ac97_patch.c
-===================================================================
---- linux-2.6.21.7.orig/sound/pci/ac97/ac97_patch.c
-+++ linux-2.6.21.7/sound/pci/ac97/ac97_patch.c
+--- a/sound/pci/ac97/ac97_patch.c
++++ b/sound/pci/ac97/ac97_patch.c
@@ -29,6 +29,10 @@
#include <linux/slab.h>
#include <linux/mutex.h>
diff --git a/target/linux/pxa/patches-2.6.21/028-gumstix-asoc.patch b/target/linux/pxa/patches-2.6.21/028-gumstix-asoc.patch
index 5e6d11fb1..c9f014ff2 100644
--- a/target/linux/pxa/patches-2.6.21/028-gumstix-asoc.patch
+++ b/target/linux/pxa/patches-2.6.21/028-gumstix-asoc.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.21.7/sound/soc/pxa/Kconfig
-===================================================================
---- linux-2.6.21.7.orig/sound/soc/pxa/Kconfig
-+++ linux-2.6.21.7/sound/soc/pxa/Kconfig
+--- a/sound/soc/pxa/Kconfig
++++ b/sound/soc/pxa/Kconfig
@@ -16,6 +16,7 @@ config SND_PXA2XX_SOC_AC97
tristate
select AC97_BUS
@@ -23,10 +21,8 @@ Index: linux-2.6.21.7/sound/soc/pxa/Kconfig
+ Say Y if you want to add support for SoC audio on Gumstix
+
endmenu
-Index: linux-2.6.21.7/sound/soc/pxa/Makefile
-===================================================================
---- linux-2.6.21.7.orig/sound/soc/pxa/Makefile
-+++ linux-2.6.21.7/sound/soc/pxa/Makefile
+--- a/sound/soc/pxa/Makefile
++++ b/sound/soc/pxa/Makefile
@@ -12,9 +12,11 @@ snd-soc-corgi-objs := corgi.o
snd-soc-poodle-objs := poodle.o
snd-soc-tosa-objs := tosa.o
@@ -39,10 +35,8 @@ Index: linux-2.6.21.7/sound/soc/pxa/Makefile
obj-$(CONFIG_SND_PXA2XX_SOC_SPITZ) += snd-soc-spitz.o
+obj-$(CONFIG_SND_PXA2XX_SOC_GUMSTIX) += snd-soc-gumstix.o
-Index: linux-2.6.21.7/sound/soc/pxa/gumstix.c
-===================================================================
--- /dev/null
-+++ linux-2.6.21.7/sound/soc/pxa/gumstix.c
++++ b/sound/soc/pxa/gumstix.c
@@ -0,0 +1,109 @@
+/*
+ * gumstix.c -- SoC audio for Gumstix
@@ -153,10 +147,8 @@ Index: linux-2.6.21.7/sound/soc/pxa/gumstix.c
+MODULE_AUTHOR("Craig Hughes <craig@gumstix.com>");
+MODULE_DESCRIPTION("ALSA SoC Gumstix");
+MODULE_LICENSE("GPL");
-Index: linux-2.6.21.7/sound/soc/codecs/ac97.c
-===================================================================
---- linux-2.6.21.7.orig/sound/soc/codecs/ac97.c
-+++ linux-2.6.21.7/sound/soc/codecs/ac97.c
+--- a/sound/soc/codecs/ac97.c
++++ b/sound/soc/codecs/ac97.c
@@ -43,7 +43,7 @@ static int ac97_prepare(struct snd_pcm_s
#define STD_AC97_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |\
SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000)
@@ -175,10 +167,8 @@ Index: linux-2.6.21.7/sound/soc/codecs/ac97.c
static unsigned int ac97_read(struct snd_soc_codec *codec,
unsigned int reg)
{
-Index: linux-2.6.21.7/sound/soc/codecs/ac97.h
-===================================================================
---- linux-2.6.21.7.orig/sound/soc/codecs/ac97.h
-+++ linux-2.6.21.7/sound/soc/codecs/ac97.h
+--- a/sound/soc/codecs/ac97.h
++++ b/sound/soc/codecs/ac97.h
@@ -14,5 +14,6 @@
#define __LINUX_SND_SOC_AC97_H
@@ -186,10 +176,8 @@ Index: linux-2.6.21.7/sound/soc/codecs/ac97.h
+extern struct snd_soc_codec_dai ac97_dai;
#endif
-Index: linux-2.6.21.7/sound/soc/pxa/pxa2xx-ac97.c
-===================================================================
---- linux-2.6.21.7.orig/sound/soc/pxa/pxa2xx-ac97.c
-+++ linux-2.6.21.7/sound/soc/pxa/pxa2xx-ac97.c
+--- a/sound/soc/pxa/pxa2xx-ac97.c
++++ b/sound/soc/pxa/pxa2xx-ac97.c
@@ -154,18 +154,26 @@ static void pxa2xx_ac97_warm_reset(struc
static void pxa2xx_ac97_cold_reset(struct snd_ac97 *ac97)
diff --git a/target/linux/pxa/patches-2.6.21/029-disable-uncompress-message.patch b/target/linux/pxa/patches-2.6.21/029-disable-uncompress-message.patch
index 0fd97fd52..dfd0ad737 100644
--- a/target/linux/pxa/patches-2.6.21/029-disable-uncompress-message.patch
+++ b/target/linux/pxa/patches-2.6.21/029-disable-uncompress-message.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.21.7/arch/arm/boot/compressed/misc.c
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/boot/compressed/misc.c
-+++ linux-2.6.21.7/arch/arm/boot/compressed/misc.c
+--- a/arch/arm/boot/compressed/misc.c
++++ b/arch/arm/boot/compressed/misc.c
@@ -322,7 +322,6 @@ void flush_window(void)
bytes_out += (ulg)outcnt;
output_ptr += (ulg)outcnt;
diff --git a/target/linux/pxa/patches-2.6.21/030-serial-divisor.patch b/target/linux/pxa/patches-2.6.21/030-serial-divisor.patch
index 036fb634c..5f9e386d5 100644
--- a/target/linux/pxa/patches-2.6.21/030-serial-divisor.patch
+++ b/target/linux/pxa/patches-2.6.21/030-serial-divisor.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.21.7/drivers/serial/pxa.c
-===================================================================
---- linux-2.6.21.7.orig/drivers/serial/pxa.c
-+++ linux-2.6.21.7/drivers/serial/pxa.c
+--- a/drivers/serial/pxa.c
++++ b/drivers/serial/pxa.c
@@ -41,6 +41,7 @@
#include <linux/platform_device.h>
#include <linux/tty.h>
diff --git a/target/linux/pxa/patches-2.6.21/031-mmc-card-detect.patch b/target/linux/pxa/patches-2.6.21/031-mmc-card-detect.patch
index 9954ed843..890f19578 100644
--- a/target/linux/pxa/patches-2.6.21/031-mmc-card-detect.patch
+++ b/target/linux/pxa/patches-2.6.21/031-mmc-card-detect.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.21.7/arch/arm/mach-pxa/gumstix.c
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/mach-pxa/gumstix.c
-+++ linux-2.6.21.7/arch/arm/mach-pxa/gumstix.c
+--- a/arch/arm/mach-pxa/gumstix.c
++++ b/arch/arm/mach-pxa/gumstix.c
@@ -29,19 +29,55 @@
#include "generic.h"
@@ -61,10 +59,8 @@ Index: linux-2.6.21.7/arch/arm/mach-pxa/gumstix.c
};
static struct pxa2xx_udc_mach_info gumstix_udc_info __initdata = {
-Index: linux-2.6.21.7/include/asm-arm/arch-pxa/gumstix.h
-===================================================================
---- linux-2.6.21.7.orig/include/asm-arm/arch-pxa/gumstix.h
-+++ linux-2.6.21.7/include/asm-arm/arch-pxa/gumstix.h
+--- a/include/asm-arm/arch-pxa/gumstix.h
++++ b/include/asm-arm/arch-pxa/gumstix.h
@@ -36,6 +36,12 @@
#define GPIO_GUMSTIX_USB_GPIOx_CON_MD (GPIO_GUMSTIX_USB_GPIOx | GPIO_OUT)
#define GPIO_GUMSTIX_USB_GPIOx_DIS_MD (GPIO_GUMSTIX_USB_GPIOx | GPIO_IN)
diff --git a/target/linux/pxa/patches-2.6.21/032-misalignment-handling.patch b/target/linux/pxa/patches-2.6.21/032-misalignment-handling.patch
index dca1cbed0..980d5a6f9 100644
--- a/target/linux/pxa/patches-2.6.21/032-misalignment-handling.patch
+++ b/target/linux/pxa/patches-2.6.21/032-misalignment-handling.patch
@@ -1,8 +1,6 @@
Change the default alingment handling to not be silent failure
-Index: linux-2.6.21.7/arch/arm/mm/alignment.c
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/mm/alignment.c
-+++ linux-2.6.21.7/arch/arm/mm/alignment.c
+--- a/arch/arm/mm/alignment.c
++++ b/arch/arm/mm/alignment.c
@@ -797,6 +797,8 @@ static int __init alignment_init(void)
res->write_proc = proc_alignment_write;
#endif
@@ -12,10 +10,8 @@ Index: linux-2.6.21.7/arch/arm/mm/alignment.c
hook_fault_code(1, do_alignment, SIGILL, "alignment exception");
hook_fault_code(3, do_alignment, SIGILL, "alignment exception");
-Index: linux-2.6.21.7/arch/arm/Kconfig
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/Kconfig
-+++ linux-2.6.21.7/arch/arm/Kconfig
+--- a/arch/arm/Kconfig
++++ b/arch/arm/Kconfig
@@ -709,6 +709,19 @@ config ALIGNMENT_TRAP
correct operation of some network protocols. With an IP-only
configuration it is safe to say N, otherwise say Y.
diff --git a/target/linux/pxa/patches-2.6.21/033-compile-fix-pxa_cpufreq.patch b/target/linux/pxa/patches-2.6.21/033-compile-fix-pxa_cpufreq.patch
index 4ef55a333..4da27520d 100644
--- a/target/linux/pxa/patches-2.6.21/033-compile-fix-pxa_cpufreq.patch
+++ b/target/linux/pxa/patches-2.6.21/033-compile-fix-pxa_cpufreq.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.21.7/arch/arm/mach-pxa/cpu-pxa.c
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/mach-pxa/cpu-pxa.c
-+++ linux-2.6.21.7/arch/arm/mach-pxa/cpu-pxa.c
+--- a/arch/arm/mach-pxa/cpu-pxa.c
++++ b/arch/arm/mach-pxa/cpu-pxa.c
@@ -42,7 +42,7 @@
#define DEBUG 0
diff --git a/target/linux/pxa/patches-2.6.21/034-ramfs-mode-support.patch b/target/linux/pxa/patches-2.6.21/034-ramfs-mode-support.patch
index d8fa62edc..81548573f 100644
--- a/target/linux/pxa/patches-2.6.21/034-ramfs-mode-support.patch
+++ b/target/linux/pxa/patches-2.6.21/034-ramfs-mode-support.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.21.7/fs/ramfs/inode.c
-===================================================================
---- linux-2.6.21.7.orig/fs/ramfs/inode.c
-+++ linux-2.6.21.7/fs/ramfs/inode.c
+--- a/fs/ramfs/inode.c
++++ b/fs/ramfs/inode.c
@@ -33,6 +33,7 @@
#include <linux/smp_lock.h>
#include <linux/backing-dev.h>
diff --git a/target/linux/pxa/patches-2.6.21/035-pxafb-definition.patch b/target/linux/pxa/patches-2.6.21/035-pxafb-definition.patch
index e45dad3ae..d48b6e827 100644
--- a/target/linux/pxa/patches-2.6.21/035-pxafb-definition.patch
+++ b/target/linux/pxa/patches-2.6.21/035-pxafb-definition.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.21.7/arch/arm/mach-pxa/gumstix.c
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/mach-pxa/gumstix.c
-+++ linux-2.6.21.7/arch/arm/mach-pxa/gumstix.c
+--- a/arch/arm/mach-pxa/gumstix.c
++++ b/arch/arm/mach-pxa/gumstix.c
@@ -25,6 +25,7 @@
#include <asm/arch/udc.h>
#include <asm/arch/mmc.h>
@@ -110,10 +108,8 @@ Index: linux-2.6.21.7/arch/arm/mach-pxa/gumstix.c
(void) platform_add_devices(devices, ARRAY_SIZE(devices));
}
-Index: linux-2.6.21.7/drivers/video/Kconfig
-===================================================================
---- linux-2.6.21.7.orig/drivers/video/Kconfig
-+++ linux-2.6.21.7/drivers/video/Kconfig
+--- a/drivers/video/Kconfig
++++ b/drivers/video/Kconfig
@@ -1495,6 +1495,37 @@ config FB_PXA
If unsure, say N.
@@ -152,10 +148,8 @@ Index: linux-2.6.21.7/drivers/video/Kconfig
config FB_PXA_PARAMETERS
bool "PXA LCD command line parameters"
default n
-Index: linux-2.6.21.7/drivers/video/pxafb.c
-===================================================================
---- linux-2.6.21.7.orig/drivers/video/pxafb.c
-+++ linux-2.6.21.7/drivers/video/pxafb.c
+--- a/drivers/video/pxafb.c
++++ b/drivers/video/pxafb.c
@@ -22,6 +22,7 @@
*
*/
diff --git a/target/linux/pxa/patches-2.6.21/036-270-usb-gadget-udc.patch b/target/linux/pxa/patches-2.6.21/036-270-usb-gadget-udc.patch
index 7dcac4b7d..4f1a5a9d2 100644
--- a/target/linux/pxa/patches-2.6.21/036-270-usb-gadget-udc.patch
+++ b/target/linux/pxa/patches-2.6.21/036-270-usb-gadget-udc.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.21.7/drivers/usb/gadget/Kconfig
-===================================================================
---- linux-2.6.21.7.orig/drivers/usb/gadget/Kconfig
-+++ linux-2.6.21.7/drivers/usb/gadget/Kconfig
+--- a/drivers/usb/gadget/Kconfig
++++ b/drivers/usb/gadget/Kconfig
@@ -129,6 +129,28 @@ config USB_PXA2XX_SMALL
default y if USB_ETH
default y if USB_G_SERIAL
@@ -31,10 +29,8 @@ Index: linux-2.6.21.7/drivers/usb/gadget/Kconfig
config USB_GADGET_GOKU
boolean "Toshiba TC86C001 'Goku-S'"
depends on PCI
-Index: linux-2.6.21.7/drivers/usb/gadget/Makefile
-===================================================================
---- linux-2.6.21.7.orig/drivers/usb/gadget/Makefile
-+++ linux-2.6.21.7/drivers/usb/gadget/Makefile
+--- a/drivers/usb/gadget/Makefile
++++ b/drivers/usb/gadget/Makefile
@@ -7,6 +7,7 @@ obj-$(CONFIG_USB_PXA2XX) += pxa2xx_udc.o
obj-$(CONFIG_USB_GOKU) += goku_udc.o
obj-$(CONFIG_USB_OMAP) += omap_udc.o
@@ -43,10 +39,8 @@ Index: linux-2.6.21.7/drivers/usb/gadget/Makefile
obj-$(CONFIG_USB_AT91) += at91_udc.o
obj-$(CONFIG_USB_GADGET_GUMSTIX) += gumstix_gadget.o
-Index: linux-2.6.21.7/drivers/usb/gadget/pxa27x_udc.c
-===================================================================
--- /dev/null
-+++ linux-2.6.21.7/drivers/usb/gadget/pxa27x_udc.c
++++ b/drivers/usb/gadget/pxa27x_udc.c
@@ -0,0 +1,2352 @@
+/*
+ * linux/drivers/usb/gadget/pxa27x_udc.c
@@ -2400,10 +2394,8 @@ Index: linux-2.6.21.7/drivers/usb/gadget/pxa27x_udc.c
+MODULE_AUTHOR("Frank Becker, Robert Schwebel, David Brownell");
+MODULE_LICENSE("GPL");
+
-Index: linux-2.6.21.7/drivers/usb/gadget/pxa27x_udc.h
-===================================================================
--- /dev/null
-+++ linux-2.6.21.7/drivers/usb/gadget/pxa27x_udc.h
++++ b/drivers/usb/gadget/pxa27x_udc.h
@@ -0,0 +1,332 @@
+/*
+ * linux/drivers/usb/gadget/pxa27x_udc.h
diff --git a/target/linux/pxa/patches-2.6.21/037-gumstix-pxa270-usb-host.patch b/target/linux/pxa/patches-2.6.21/037-gumstix-pxa270-usb-host.patch
index 346277091..8b43765ce 100644
--- a/target/linux/pxa/patches-2.6.21/037-gumstix-pxa270-usb-host.patch
+++ b/target/linux/pxa/patches-2.6.21/037-gumstix-pxa270-usb-host.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.21.7/arch/arm/mach-pxa/gumstix.c
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/mach-pxa/gumstix.c
-+++ linux-2.6.21.7/arch/arm/mach-pxa/gumstix.c
+--- a/arch/arm/mach-pxa/gumstix.c
++++ b/arch/arm/mach-pxa/gumstix.c
@@ -22,6 +22,7 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
@@ -45,10 +43,8 @@ Index: linux-2.6.21.7/arch/arm/mach-pxa/gumstix.c
pxa_set_udc_info(&gumstix_udc_info);
#if defined(CONFIG_FB_PXA_ALPS_CDOLLAR) | defined(CONFIG_FB_PXA_SHARP_LQ043_PSP) | defined(CONFIG_FB_PXA_SAMSUNG_LTE430WQ_F0C)
set_pxa_fb_info(&gumstix_fb_info);
-Index: linux-2.6.21.7/drivers/usb/gadget/ether.c
-===================================================================
---- linux-2.6.21.7.orig/drivers/usb/gadget/ether.c
-+++ linux-2.6.21.7/drivers/usb/gadget/ether.c
+--- a/drivers/usb/gadget/ether.c
++++ b/drivers/usb/gadget/ether.c
@@ -260,6 +260,8 @@ MODULE_PARM_DESC(host_addr, "Host Ethern
#ifdef CONFIG_USB_GADGET_PXA27X
@@ -216,10 +212,8 @@ Index: linux-2.6.21.7/drivers/usb/gadget/ether.c
}
}
#endif
-Index: linux-2.6.21.7/drivers/usb/gadget/file_storage.c
-===================================================================
---- linux-2.6.21.7.orig/drivers/usb/gadget/file_storage.c
-+++ linux-2.6.21.7/drivers/usb/gadget/file_storage.c
+--- a/drivers/usb/gadget/file_storage.c
++++ b/drivers/usb/gadget/file_storage.c
@@ -280,6 +280,12 @@ MODULE_LICENSE("Dual BSD/GPL");
#define DRIVER_PRODUCT_ID 0xa4a5 // Linux-USB File-backed Storage Gadget
@@ -274,10 +268,8 @@ Index: linux-2.6.21.7/drivers/usb/gadget/file_storage.c
fsg->state = FSG_STATE_TERMINATED; // The thread is dead
fsg_unbind(gadget);
close_all_backing_files(fsg);
-Index: linux-2.6.21.7/drivers/usb/gadget/serial.c
-===================================================================
---- linux-2.6.21.7.orig/drivers/usb/gadget/serial.c
-+++ linux-2.6.21.7/drivers/usb/gadget/serial.c
+--- a/drivers/usb/gadget/serial.c
++++ b/drivers/usb/gadget/serial.c
@@ -126,6 +126,10 @@ static int debug = 1;
#define GS_LOG2_NOTIFY_INTERVAL 5 /* 1 << 5 == 32 msec */
#define GS_NOTIFY_MAXPACKET 8
@@ -322,10 +314,8 @@ Index: linux-2.6.21.7/drivers/usb/gadget/serial.c
if (!ep) {
printk(KERN_ERR "gs_bind: cannot run ACM on %s\n", gadget->name);
goto autoconf_fail;
-Index: linux-2.6.21.7/drivers/usb/gadget/zero.c
-===================================================================
---- linux-2.6.21.7.orig/drivers/usb/gadget/zero.c
-+++ linux-2.6.21.7/drivers/usb/gadget/zero.c
+--- a/drivers/usb/gadget/zero.c
++++ b/drivers/usb/gadget/zero.c
@@ -212,6 +212,11 @@ module_param (loopdefault, bool, S_IRUGO
#define STRING_SOURCE_SINK 250
#define STRING_LOOPBACK 251
diff --git a/target/linux/pxa/patches-2.6.21/038-cpufreq-fixup.patch b/target/linux/pxa/patches-2.6.21/038-cpufreq-fixup.patch
index ddd2919d8..de58cd214 100644
--- a/target/linux/pxa/patches-2.6.21/038-cpufreq-fixup.patch
+++ b/target/linux/pxa/patches-2.6.21/038-cpufreq-fixup.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.21.7/drivers/cpufreq/cpufreq_ondemand.c
-===================================================================
---- linux-2.6.21.7.orig/drivers/cpufreq/cpufreq_ondemand.c
-+++ linux-2.6.21.7/drivers/cpufreq/cpufreq_ondemand.c
+--- a/drivers/cpufreq/cpufreq_ondemand.c
++++ b/drivers/cpufreq/cpufreq_ondemand.c
@@ -573,7 +573,7 @@ static int cpufreq_governor_dbs(struct c
return 0;
}
@@ -11,10 +9,8 @@ Index: linux-2.6.21.7/drivers/cpufreq/cpufreq_ondemand.c
.name = "ondemand",
.governor = cpufreq_governor_dbs,
.owner = THIS_MODULE,
-Index: linux-2.6.21.7/drivers/cpufreq/cpufreq_conservative.c
-===================================================================
---- linux-2.6.21.7.orig/drivers/cpufreq/cpufreq_conservative.c
-+++ linux-2.6.21.7/drivers/cpufreq/cpufreq_conservative.c
+--- a/drivers/cpufreq/cpufreq_conservative.c
++++ b/drivers/cpufreq/cpufreq_conservative.c
@@ -551,7 +551,7 @@ static int cpufreq_governor_dbs(struct c
return 0;
}
diff --git a/target/linux/pxa/patches-2.6.21/040-pxa-regs-fixup.patch b/target/linux/pxa/patches-2.6.21/040-pxa-regs-fixup.patch
index 2f8923b89..9f983fb80 100644
--- a/target/linux/pxa/patches-2.6.21/040-pxa-regs-fixup.patch
+++ b/target/linux/pxa/patches-2.6.21/040-pxa-regs-fixup.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.21.7/include/asm-arm/arch-pxa/udc.h
-===================================================================
---- linux-2.6.21.7.orig/include/asm-arm/arch-pxa/udc.h
-+++ linux-2.6.21.7/include/asm-arm/arch-pxa/udc.h
+--- a/include/asm-arm/arch-pxa/udc.h
++++ b/include/asm-arm/arch-pxa/udc.h
@@ -5,6 +5,7 @@
* USB Device Controller (UDC) is wired.
*
diff --git a/target/linux/pxa/patches-2.6.21/041-gumstix-fb-logo.patch b/target/linux/pxa/patches-2.6.21/041-gumstix-fb-logo.patch
index ad222b33b..4b9abe150 100644
--- a/target/linux/pxa/patches-2.6.21/041-gumstix-fb-logo.patch
+++ b/target/linux/pxa/patches-2.6.21/041-gumstix-fb-logo.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.21.7/drivers/video/logo/logo_linux_clut224.ppm
-===================================================================
---- linux-2.6.21.7.orig/drivers/video/logo/logo_linux_clut224.ppm
-+++ linux-2.6.21.7/drivers/video/logo/logo_linux_clut224.ppm
+--- a/drivers/video/logo/logo_linux_clut224.ppm
++++ b/drivers/video/logo/logo_linux_clut224.ppm
@@ -1,1604 +1,8848 @@
P3
-# Standard 224-color Linux logo
diff --git a/target/linux/pxa/patches-2.6.21/042-gumstix-pxa270-mmc.patch b/target/linux/pxa/patches-2.6.21/042-gumstix-pxa270-mmc.patch
index c6b6323f3..02fddd64b 100644
--- a/target/linux/pxa/patches-2.6.21/042-gumstix-pxa270-mmc.patch
+++ b/target/linux/pxa/patches-2.6.21/042-gumstix-pxa270-mmc.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.21.7/arch/arm/mach-pxa/gumstix.c
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/mach-pxa/gumstix.c
-+++ linux-2.6.21.7/arch/arm/mach-pxa/gumstix.c
+--- a/arch/arm/mach-pxa/gumstix.c
++++ b/arch/arm/mach-pxa/gumstix.c
@@ -33,8 +33,9 @@
static struct pxamci_platform_data gumstix_mci_platform_data;
diff --git a/target/linux/pxa/patches-2.6.21/043-pxafb-18bpp-mode.patch b/target/linux/pxa/patches-2.6.21/043-pxafb-18bpp-mode.patch
index f8a6c1ad6..c41310a61 100644
--- a/target/linux/pxa/patches-2.6.21/043-pxafb-18bpp-mode.patch
+++ b/target/linux/pxa/patches-2.6.21/043-pxafb-18bpp-mode.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.21.7/drivers/video/pxafb.c
-===================================================================
---- linux-2.6.21.7.orig/drivers/video/pxafb.c
-+++ linux-2.6.21.7/drivers/video/pxafb.c
+--- a/drivers/video/pxafb.c
++++ b/drivers/video/pxafb.c
@@ -191,6 +191,10 @@ static int pxafb_bpp_to_lccr3(struct fb_
case 4: ret = LCCR3_4BPP; break;
case 8: ret = LCCR3_8BPP; break;
@@ -205,10 +203,8 @@ Index: linux-2.6.21.7/drivers/video/pxafb.c
dev_info(dev, "overriding bit depth: %d\n", bpp);
break;
default:
-Index: linux-2.6.21.7/include/asm-arm/arch-pxa/pxa-regs.h
-===================================================================
---- linux-2.6.21.7.orig/include/asm-arm/arch-pxa/pxa-regs.h
-+++ linux-2.6.21.7/include/asm-arm/arch-pxa/pxa-regs.h
+--- a/include/asm-arm/arch-pxa/pxa-regs.h
++++ b/include/asm-arm/arch-pxa/pxa-regs.h
@@ -1323,6 +1323,8 @@
#define GPIO83_NSTXD 83 /* NSSP transmit */
#define GPIO84_NSRXD 84 /* NSSP receive */
@@ -240,10 +236,8 @@ Index: linux-2.6.21.7/include/asm-arm/arch-pxa/pxa-regs.h
#define FDADR0 __REG(0x44000200) /* DMA Channel 0 Frame Descriptor Address Register */
#define FSADR0 __REG(0x44000204) /* DMA Channel 0 Frame Source Address Register */
-Index: linux-2.6.21.7/include/asm-arm/arch-pxa/pxafb.h
-===================================================================
---- linux-2.6.21.7.orig/include/asm-arm/arch-pxa/pxafb.h
-+++ linux-2.6.21.7/include/asm-arm/arch-pxa/pxafb.h
+--- a/include/asm-arm/arch-pxa/pxafb.h
++++ b/include/asm-arm/arch-pxa/pxafb.h
@@ -25,6 +25,7 @@ struct pxafb_mode_info {
u_short xres;
u_short yres;
@@ -263,10 +257,8 @@ Index: linux-2.6.21.7/include/asm-arm/arch-pxa/pxafb.h
};
struct pxafb_mach_info {
-Index: linux-2.6.21.7/arch/arm/mach-pxa/gumstix.c
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/mach-pxa/gumstix.c
-+++ linux-2.6.21.7/arch/arm/mach-pxa/gumstix.c
+--- a/arch/arm/mach-pxa/gumstix.c
++++ b/arch/arm/mach-pxa/gumstix.c
@@ -146,7 +146,8 @@ static struct pxafb_mode_info gumstix_fb
.pixclock = 110000,
.xres = 480,
@@ -287,10 +279,8 @@ Index: linux-2.6.21.7/arch/arm/mach-pxa/gumstix.c
.sync = 0, // Hsync and Vsync both active low
};
-Index: linux-2.6.21.7/drivers/video/cfbfillrect.c
-===================================================================
---- linux-2.6.21.7.orig/drivers/video/cfbfillrect.c
-+++ linux-2.6.21.7/drivers/video/cfbfillrect.c
+--- a/drivers/video/cfbfillrect.c
++++ b/drivers/video/cfbfillrect.c
@@ -62,7 +62,10 @@ pixel_to_pat( u32 bpp, u32 pixel)
return 0x0001001001001001ul*pixel;
case 16:
@@ -322,10 +312,8 @@ Index: linux-2.6.21.7/drivers/video/cfbfillrect.c
unsigned long __iomem *dst;
int dst_idx, left;
-Index: linux-2.6.21.7/drivers/video/cfbimgblt.c
-===================================================================
---- linux-2.6.21.7.orig/drivers/video/cfbimgblt.c
-+++ linux-2.6.21.7/drivers/video/cfbimgblt.c
+--- a/drivers/video/cfbimgblt.c
++++ b/drivers/video/cfbimgblt.c
@@ -83,7 +83,7 @@ static inline void color_imageblit(const
/* Draw the penguin */
u32 __iomem *dst, *dst2;
@@ -362,10 +350,8 @@ Index: linux-2.6.21.7/drivers/video/cfbimgblt.c
u32 width = image->width;
u32 dx = image->dx, dy = image->dy;
u8 __iomem *dst1;
-Index: linux-2.6.21.7/drivers/video/cfbcopyarea.c
-===================================================================
---- linux-2.6.21.7.orig/drivers/video/cfbcopyarea.c
-+++ linux-2.6.21.7/drivers/video/cfbcopyarea.c
+--- a/drivers/video/cfbcopyarea.c
++++ b/drivers/video/cfbcopyarea.c
@@ -365,8 +365,8 @@ void cfb_copyarea(struct fb_info *p, con
dst = src = (unsigned long __iomem *)((unsigned long)p->screen_base & ~(bytes-1));
dst_idx = src_idx = 8*((unsigned long)p->screen_base & (bytes-1));
@@ -395,10 +381,8 @@ Index: linux-2.6.21.7/drivers/video/cfbcopyarea.c
dst_idx += bits_per_line;
src_idx += bits_per_line;
}
-Index: linux-2.6.21.7/drivers/video/console/fbcon.c
-===================================================================
---- linux-2.6.21.7.orig/drivers/video/console/fbcon.c
-+++ linux-2.6.21.7/drivers/video/console/fbcon.c
+--- a/drivers/video/console/fbcon.c
++++ b/drivers/video/console/fbcon.c
@@ -983,9 +983,10 @@ static const char *fbcon_startup(void)
DPRINTK("mode: %s\n", info->fix.id);
@@ -412,10 +396,8 @@ Index: linux-2.6.21.7/drivers/video/console/fbcon.c
#ifdef CONFIG_ATARI
if (MACH_IS_ATARI) {
-Index: linux-2.6.21.7/Documentation/fb/pxafb.txt
-===================================================================
---- linux-2.6.21.7.orig/Documentation/fb/pxafb.txt
-+++ linux-2.6.21.7/Documentation/fb/pxafb.txt
+--- a/Documentation/fb/pxafb.txt
++++ b/Documentation/fb/pxafb.txt
@@ -9,11 +9,13 @@ For example:
or on the kernel command line
video=pxafb:mode:640x480-8,passive
diff --git a/target/linux/pxa/patches-2.6.21/044-smc911x-fixup.patch b/target/linux/pxa/patches-2.6.21/044-smc911x-fixup.patch
index 0985258c3..7ddfd5fda 100644
--- a/target/linux/pxa/patches-2.6.21/044-smc911x-fixup.patch
+++ b/target/linux/pxa/patches-2.6.21/044-smc911x-fixup.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.21.7/drivers/net/smc911x.c
-===================================================================
---- linux-2.6.21.7.orig/drivers/net/smc911x.c
-+++ linux-2.6.21.7/drivers/net/smc911x.c
+--- a/drivers/net/smc911x.c
++++ b/drivers/net/smc911x.c
@@ -76,6 +76,7 @@ static const char version[] =
#include <linux/etherdevice.h>
#include <linux/skbuff.h>
@@ -154,10 +152,8 @@ Index: linux-2.6.21.7/drivers/net/smc911x.c
return platform_driver_register(&smc911x_driver);
}
-Index: linux-2.6.21.7/drivers/net/gumstix-smc911x.c
-===================================================================
--- /dev/null
-+++ linux-2.6.21.7/drivers/net/gumstix-smc911x.c
++++ b/drivers/net/gumstix-smc911x.c
@@ -0,0 +1,148 @@
+/*
+ * Gumstix SMC911x chip intialization driver
@@ -307,10 +303,8 @@ Index: linux-2.6.21.7/drivers/net/gumstix-smc911x.c
+MODULE_AUTHOR("Craig Hughes <craig@gumstix.com>");
+MODULE_DESCRIPTION("Gumstix board SMC911x chip initialization driver");
+MODULE_VERSION("1:0.1");
-Index: linux-2.6.21.7/drivers/net/Kconfig
-===================================================================
---- linux-2.6.21.7.orig/drivers/net/Kconfig
-+++ linux-2.6.21.7/drivers/net/Kconfig
+--- a/drivers/net/Kconfig
++++ b/drivers/net/Kconfig
@@ -1020,6 +1020,13 @@ config SMC911X
called smc911x. If you want to compile it as a module, say M
here and read <file:Documentation/modules.txt>
@@ -325,10 +319,8 @@ Index: linux-2.6.21.7/drivers/net/Kconfig
config NET_VENDOR_RACAL
bool "Racal-Interlan (Micom) NI cards"
depends on NET_ETHERNET && ISA
-Index: linux-2.6.21.7/drivers/net/Makefile
-===================================================================
---- linux-2.6.21.7.orig/drivers/net/Makefile
-+++ linux-2.6.21.7/drivers/net/Makefile
+--- a/drivers/net/Makefile
++++ b/drivers/net/Makefile
@@ -202,6 +202,7 @@ obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o
obj-$(CONFIG_MACB) += macb.o
@@ -337,10 +329,8 @@ Index: linux-2.6.21.7/drivers/net/Makefile
obj-$(CONFIG_ARM) += arm/
obj-$(CONFIG_DEV_APPLETALK) += appletalk/
obj-$(CONFIG_TR) += tokenring/
-Index: linux-2.6.21.7/include/asm-arm/arch-pxa/gumstix.h
-===================================================================
---- linux-2.6.21.7.orig/include/asm-arm/arch-pxa/gumstix.h
-+++ linux-2.6.21.7/include/asm-arm/arch-pxa/gumstix.h
+--- a/include/asm-arm/arch-pxa/gumstix.h
++++ b/include/asm-arm/arch-pxa/gumstix.h
@@ -52,7 +52,7 @@
#define GPIO_GUMSTIX_ETH0_RST 80
#define GPIO_GUMSTIX_ETH0 36
@@ -350,10 +340,8 @@ Index: linux-2.6.21.7/include/asm-arm/arch-pxa/gumstix.h
#define GPIO_GUMSTIX_ETH0 99
#endif
#define GPIO_GUMSTIX_ETH1_RST 52
-Index: linux-2.6.21.7/drivers/net/smc911x.h
-===================================================================
---- linux-2.6.21.7.orig/drivers/net/smc911x.h
-+++ linux-2.6.21.7/drivers/net/smc911x.h
+--- a/drivers/net/smc911x.h
++++ b/drivers/net/smc911x.h
@@ -33,7 +33,9 @@
* Use the DMA feature on PXA chips
*/