diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-07-09 16:08:14 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-07-09 16:08:14 +0100 |
| commit | db78450abdb88b44322c551fc2868d1b2383355b (patch) | |
| tree | eef692b00179acbd6f46b0eacac4934107a340d2 /arch | |
| parent | 4e66a0f536ad449a71de75bc81f4a830ef38d538 (diff) | |
| parent | e2ce0e718ee72e5915d35a6f4af40fa249cd626d (diff) | |
| download | linux-3.10-db78450abdb88b44322c551fc2868d1b2383355b.tar.gz linux-3.10-db78450abdb88b44322c551fc2868d1b2383355b.tar.bz2 linux-3.10-db78450abdb88b44322c551fc2868d1b2383355b.zip | |
Merge branch 'for-rmk' of git://git.marvell.com/orion
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-kirkwood/mpp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-kirkwood/mpp.h b/arch/arm/mach-kirkwood/mpp.h index e021a80c2ca..bc74278ed31 100644 --- a/arch/arm/mach-kirkwood/mpp.h +++ b/arch/arm/mach-kirkwood/mpp.h @@ -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 ) |