Skip to content

Commit

Permalink
Merge branch 'for-rmk' of git://git.marvell.com/orion
Browse files Browse the repository at this point in the history
  • Loading branch information
Russell King authored and Russell King committed Jul 9, 2009
2 parents 4e66a0f + e2ce0e7 commit db78450
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/arm/mach-kirkwood/mpp.h
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@

#define MPP48_GPIO MPP( 48, 0x0, 1, 1, 0, 0, 0, 1 )
#define MPP48_TSMP12 MPP( 48, 0x1, 1, 1, 0, 0, 0, 1 )
#define MPP48_TDM_DTX MPP( 48. 0x2, 0, 1, 0, 0, 0, 1 )
#define MPP48_TDM_DTX MPP( 48, 0x2, 0, 1, 0, 0, 0, 1 )

#define MPP49_GPIO MPP( 49, 0x0, 1, 1, 0, 0, 0, 1 )
#define MPP49_TSMP9 MPP( 49, 0x1, 1, 1, 0, 0, 0, 1 )
Expand Down

0 comments on commit db78450

Please sign in to comment.