[kernel/2.6.38] fix gcc-4.6 set but unused warnings

[openwrt.git] / target / linux / omap24xx / patches-3.1 / 597-cbus-tahvo-usb-platform.patch

diff --git a/target/linux/omap24xx/patches-3.1/597-cbus-tahvo-usb-platform.patch b/target/linux/omap24xx/patches-3.1/597-cbus-tahvo-usb-platform.patch
index 095daaf..a635a87 100644 (file)
--- a/target/linux/omap24xx/patches-3.1/597-cbus-tahvo-usb-platform.patch
+++ b/target/linux/omap24xx/patches-3.1/597-cbus-tahvo-usb-platform.patch
@@ -1,16 +1,14 @@
-Index: linux-3.1-rc4/arch/arm/mach-omap2/board-n8x0.c
-===================================================================
---- linux-3.1-rc4.orig/arch/arm/mach-omap2/board-n8x0.c        2011-10-29 20:11:19.364504806 +0200
-+++ linux-3.1-rc4/arch/arm/mach-omap2/board-n8x0.c     2011-10-29 20:12:11.508370280 +0200
-@@ -38,6 +38,7 @@
+--- a/arch/arm/mach-omap2/board-n8x0.c
++++ b/arch/arm/mach-omap2/board-n8x0.c
+@@ -41,6 +41,7 @@
+ #include <plat/mmc.h>

  #include <plat/serial.h>
  #include <plat/serial.h>

- #include <plat/cbus.h>

  #include <plat/gpio-switch.h>
 +#include <plat/usb.h>
  
  #include "mux.h"
  
  #include <plat/gpio-switch.h>
 +#include <plat/usb.h>
  
  #include "mux.h"
  

-@@ -384,6 +385,14 @@ static struct musb_hdrc_platform_data tu
+@@ -486,6 +487,14 @@ static struct musb_hdrc_platform_data tu

        .config         = &musb_config,
  };
  
        .config         = &musb_config,
  };
  


@@ -25,7 +23,7 @@ Index: linux-3.1-rc4/arch/arm/mach-omap2/board-n8x0.c
  static void __init n8x0_usb_init(void)
  {
        int ret = 0;
  static void __init n8x0_usb_init(void)
  {
        int ret = 0;

-@@ -405,6 +414,8 @@ static void __init n8x0_usb_init(void)
+@@ -507,6 +516,8 @@ static void __init n8x0_usb_init(void)

        if (ret != 0)
                goto err;
  
        if (ret != 0)
                goto err;