atheros: rename CONFIG_ATHEROS to CONFIG_ATHEROS_AR231X

[openwrt.git] / target / linux / pxa / patches-2.6.21 / 035-pxafb-definition.patch

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 01d09a8..d48b6e8 100644 (file)
--- 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.21gum/arch/arm/mach-pxa/gumstix.c
-===================================================================
---- linux-2.6.21gum.orig/arch/arm/mach-pxa/gumstix.c
-+++ linux-2.6.21gum/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>
 @@ -25,6 +25,7 @@
  #include <asm/arch/udc.h>
  #include <asm/arch/mmc.h>


@@ -110,10 +108,8 @@ Index: linux-2.6.21gum/arch/arm/mach-pxa/gumstix.c
        (void) platform_add_devices(devices, ARRAY_SIZE(devices));
  }
  
        (void) platform_add_devices(devices, ARRAY_SIZE(devices));
  }
  

-Index: linux-2.6.21gum/drivers/video/Kconfig
-===================================================================
---- linux-2.6.21gum.orig/drivers/video/Kconfig
-+++ linux-2.6.21gum/drivers/video/Kconfig
+--- a/drivers/video/Kconfig
++++ b/drivers/video/Kconfig

 @@ -1495,6 +1495,37 @@ config FB_PXA
  
          If unsure, say N.
 @@ -1495,6 +1495,37 @@ config FB_PXA
  
          If unsure, say N.


@@ -152,10 +148,8 @@ Index: linux-2.6.21gum/drivers/video/Kconfig
  config FB_PXA_PARAMETERS
        bool "PXA LCD command line parameters"
        default n
  config FB_PXA_PARAMETERS
        bool "PXA LCD command line parameters"
        default n

-Index: linux-2.6.21gum/drivers/video/pxafb.c
-===================================================================
---- linux-2.6.21gum.orig/drivers/video/pxafb.c
-+++ linux-2.6.21gum/drivers/video/pxafb.c
+--- a/drivers/video/pxafb.c
++++ b/drivers/video/pxafb.c

 @@ -22,6 +22,7 @@
   *
   */
 @@ -22,6 +22,7 @@
   *
   */