Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db78450a authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'for-rmk' of git://git.marvell.com/orion

parents 4e66a0f5 e2ce0e71

arch/arm/mach-kirkwood/mpp.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -289,7 +289,7 @@ 




#define MPP48_GPIO		MPP( 48, 0x0, 1, 1, 0,   0,   0,   1    )

#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_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_GPIO		MPP( 49, 0x0, 1, 1, 0,   0,   0,   1    )

#define MPP49_TSMP9		MPP( 49, 0x1, 1, 1, 0,   0,   0,   1    )

#define MPP49_TSMP9		MPP( 49, 0x1, 1, 1, 0,   0,   0,   1    )