From 9f33dbcd166b2f46a04584e70f74a65215f5e81f Mon Sep 17 00:00:00 2001 From: Mike Rapoport Date: Mon, 6 Jul 2009 08:56:51 +0300 Subject: [PATCH] --- yaml --- r: 155551 b: refs/heads/master c: 22fe84394f405c673b362d23dcc2d5d095ab5f6c h: refs/heads/master i: 155549: 851d86f2b2aaf6bf334c8f2e12600afa3fb74e33 155547: 2e39456f00d8c8dc65c5ff63ffac00c0126aa73d 155543: 8aefff26cb7acf68313bab3d378a854d6162a49f 155535: ebebaa4d5b37a3b5b2948a358eb67fa45eff5245 155519: 2063217053a6ea009c8abbc0a699c9ee29bdb916 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-pxa/include/mach/mfp-pxa300.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a50d5d434e16..e325c989aa69 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 82e8b54229fb121946151b82e8ff3c3284bd723f +refs/heads/master: 22fe84394f405c673b362d23dcc2d5d095ab5f6c diff --git a/trunk/arch/arm/mach-pxa/include/mach/mfp-pxa300.h b/trunk/arch/arm/mach-pxa/include/mach/mfp-pxa300.h index ae8441192ef0..7139e0dc26d1 100644 --- a/trunk/arch/arm/mach-pxa/include/mach/mfp-pxa300.h +++ b/trunk/arch/arm/mach-pxa/include/mach/mfp-pxa300.h @@ -567,9 +567,9 @@ #define GPIO37_ULPI_DATA_OUT_7 MFP_CFG(GPIO37, AF3) #define GPIO33_ULPI_OTG_INTR MFP_CFG(GPIO33, AF1) -#define ULPI_DIR MFP_CFG_DRV(ULPI_DIR, MFP_AF0, MFP_DS01X) -#define ULPI_NXT MFP_CFG_DRV(ULPI_NXT, MFP_AF0, MFP_DS01X) -#define ULPI_STP MFP_CFG_DRV(ULPI_STP, MFP_AF0, MFP_DS01X) +#define ULPI_DIR MFP_CFG_DRV(ULPI_DIR, AF0, DS01X) +#define ULPI_NXT MFP_CFG_DRV(ULPI_NXT, AF0, DS01X) +#define ULPI_STP MFP_CFG_DRV(ULPI_STP, AF0, DS01X) #endif /* CONFIG_CPU_PXA310 */ #endif /* __ASM_ARCH_MFP_PXA300_H */