aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/pxa/patches-2.6.21/035-pxafb-definition.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2009-02-08 19:36:13 +0000
committerGabor Juhos <juhosg@openwrt.org>2009-02-08 19:36:13 +0000
commit7085e5331ecdcf4f1c314f95c9059014a805db92 (patch)
tree2083a7a4327af2e9bc154c2ecbf2165b9b15cf5c /target/linux/pxa/patches-2.6.21/035-pxafb-definition.patch
parent29e1ac054cebd1b0309aaa1465bb04ebcad5d858 (diff)
downloadupstream-7085e5331ecdcf4f1c314f95c9059014a805db92.tar.gz
upstream-7085e5331ecdcf4f1c314f95c9059014a805db92.tar.bz2
upstream-7085e5331ecdcf4f1c314f95c9059014a805db92.zip
refresh 2.6.21 patches
SVN-Revision: 14454
Diffstat (limited to 'target/linux/pxa/patches-2.6.21/035-pxafb-definition.patch')
-rw-r--r--target/linux/pxa/patches-2.6.21/035-pxafb-definition.patch18
1 files changed, 6 insertions, 12 deletions
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 e45dad3aed..d48b6e8276 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 @@
*
*/