diff mbox

ARM: OMAP3: Overo: fix merge error

Message ID 5e088bd90908161356j4d78fa1dn5e0f82f62bdd180d@mail.gmail.com (mailing list archive)
State Superseded, archived
Headers show

Commit Message

Steve Sakoman Aug. 16, 2009, 8:56 p.m. UTC
Missing definition for OVERO_GPIO_PENDOWN

Signed-off-by: Steve Sakoman <steve@sakoman.com>

---
 arch/arm/mach-omap2/board-overo.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

Comments

Steve Sakoman Aug. 16, 2009, 9:56 p.m. UTC | #1
Please ignore this patch!

A previously submitted version seems to have made its way into
linux-omap since I pulled a couple of days ago.

Sorry for the noise.

Steve

On Sun, Aug 16, 2009 at 1:56 PM, Steve Sakoman<sakoman@gmail.com> wrote:
> Missing definition for OVERO_GPIO_PENDOWN
>
> Signed-off-by: Steve Sakoman <steve@sakoman.com>
>
> ---
>  arch/arm/mach-omap2/board-overo.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/board-overo.c
> b/arch/arm/mach-omap2/board-overo.c
> index 3fd614e..65bf008 100644
> --- a/arch/arm/mach-omap2/board-overo.c
> +++ b/arch/arm/mach-omap2/board-overo.c
> @@ -51,6 +51,7 @@
>
>  #define OVERO_GPIO_BT_XGATE    15
>  #define OVERO_GPIO_W2W_NRESET  16
> +#define OVERO_GPIO_PENDOWN     114
>  #define OVERO_GPIO_BT_NRESET   164
>  #define OVERO_GPIO_USBH_CPEN   168
>  #define OVERO_GPIO_USBH_NRESET 183
> --
> 1.6.0.4
>
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/arch/arm/mach-omap2/board-overo.c
b/arch/arm/mach-omap2/board-overo.c
index 3fd614e..65bf008 100644
--- a/arch/arm/mach-omap2/board-overo.c
+++ b/arch/arm/mach-omap2/board-overo.c
@@ -51,6 +51,7 @@ 

 #define OVERO_GPIO_BT_XGATE	15
 #define OVERO_GPIO_W2W_NRESET	16
+#define OVERO_GPIO_PENDOWN	114
 #define OVERO_GPIO_BT_NRESET	164
 #define OVERO_GPIO_USBH_CPEN	168
 #define OVERO_GPIO_USBH_NRESET	183