diff options
| author |   Olof Johansson <olof@lixom.net> | 2014-07-12 09:47:12 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-12 09:47:12 -0700 |
| commit | 2df9ce91e9418dba7fe4b12f0c9ae06650655a74 (patch) | |
| tree | 1221e39458b9586094cc920d0c2d84e5c30a61cb | |
| parent | Merge tag 'renesas-soc-cleanup2-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup (diff) | |
| parent | ARM: mmp: remove duplicate SM_SCLK_SM_SCLK define (diff) | |
| download | wireguard-linux-2df9ce91e9418dba7fe4b12f0c9ae06650655a74.tar.xz wireguard-linux-2df9ce91e9418dba7fe4b12f0c9ae06650655a74.zip | |
Merge tag 'mmp-for-v3.17' of https://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux into next/cleanup
Merge "mmp for v3.17" from Haojian Zhuang:
* tag 'mmp-for-v3.17' of https://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux:
ARM: mmp: remove duplicate SM_SCLK_SM_SCLK define
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to '')
| -rw-r--r-- | arch/arm/mach-mmp/include/mach/mfp-pxa910.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-mmp/include/mach/mfp-pxa910.h b/arch/arm/mach-mmp/include/mach/mfp-pxa910.h index fbd7ee8e4897..8c78f2b16452 100644 --- a/arch/arm/mach-mmp/include/mach/mfp-pxa910.h +++ b/arch/arm/mach-mmp/include/mach/mfp-pxa910.h @@ -23,7 +23,6 @@ #define SM_nCS0_nCS0 MFP_CFG(SM_nCS0, AF0) #define SM_ADV_SM_ADV MFP_CFG(SM_ADV, AF0) #define SM_SCLK_SM_SCLK MFP_CFG(SM_SCLK, AF0) -#define SM_SCLK_SM_SCLK MFP_CFG(SM_SCLK, AF0) #define SM_BE0_SM_BE0 MFP_CFG(SM_BE0, AF1) #define SM_BE1_SM_BE1 MFP_CFG(SM_BE1, AF1) |