diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-05-21 10:12:39 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-05-21 10:12:39 -0400 |
| commit | b3f87b98aa3dc22cc58f970140113b270015cddb (patch) | |
| tree | c4aec5996567ad96310f61e9244e799f41bf2625 /arch/arm/mach-orion5x/mpp.h | |
| parent | 041245c88a29273788e8eff1353bc6e1f56c61df (diff) | |
| parent | 1afeaf5c29aa07db25760d2fbed5c08a3aec3498 (diff) | |
| download | op-kernel-dev-b3f87b98aa3dc22cc58f970140113b270015cddb.zip op-kernel-dev-b3f87b98aa3dc22cc58f970140113b270015cddb.tar.gz | |
Merge branch 'bugfixes' into nfs-for-next
Diffstat (limited to 'arch/arm/mach-orion5x/mpp.h')
| -rw-r--r-- | arch/arm/mach-orion5x/mpp.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-orion5x/mpp.h b/arch/arm/mach-orion5x/mpp.h index eac6897..db70e79 100644 --- a/arch/arm/mach-orion5x/mpp.h +++ b/arch/arm/mach-orion5x/mpp.h @@ -65,8 +65,8 @@ #define MPP8_GIGE MPP(8, 0x1, 0, 0, 1, 1, 1) #define MPP9_UNUSED MPP(9, 0x0, 0, 0, 1, 1, 1) -#define MPP9_GPIO MPP(9, 0x0, 0, 0, 1, 1, 1) -#define MPP9_GIGE MPP(9, 0x1, 1, 1, 1, 1, 1) +#define MPP9_GPIO MPP(9, 0x0, 1, 1, 1, 1, 1) +#define MPP9_GIGE MPP(9, 0x1, 0, 0, 1, 1, 1) #define MPP10_UNUSED MPP(10, 0x0, 0, 0, 1, 1, 1) #define MPP10_GPIO MPP(10, 0x0, 1, 1, 1, 1, 1) |
