Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 155551
b: refs/heads/master
c: 22fe843
h: refs/heads/master
i:
  155549: 851d86f
  155547: 2e39456
  155543: 8aefff2
  155535: ebebaa4
  155519: 2063217
v: v3
  • Loading branch information
Mike Rapoport authored and Eric Miao committed Jul 6, 2009
1 parent 6d8e5b1 commit 9f33dbc
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 82e8b54229fb121946151b82e8ff3c3284bd723f
refs/heads/master: 22fe84394f405c673b362d23dcc2d5d095ab5f6c
6 changes: 3 additions & 3 deletions trunk/arch/arm/mach-pxa/include/mach/mfp-pxa300.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

0 comments on commit 9f33dbc

Please sign in to comment.