Commit 2df9ce91 authored Jul 12, 2014 by Olof Johansson

Merge tag 'mmp-for-v3.17' of...

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>

parents 9641f408 02db444d

arch/arm/mach-mmp/include/mach/mfp-pxa910.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -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)