openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mmp for v3.17 

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJTtqnlAAoJELXbXY/c+iv2pqoQAI5V5Fr/2SdZBijLdBwHc9kB
 74YVXOFjlnZxgc6abkqqwxlUNL88zL+fcA4bryxoQBtKzxR7Ez0FC3kdDUql9qFP
 SHEf69f2nZWSi5Sw431gTFJSSfxq8wA8pmdOm340hVZAdFmwpYfKZ4Axvb8vajgM
 zbBNG+2MY3lw65zhAHYvhDMOtmrk4CzOKPO0kzNI/CwNLbIXMFA0ksyz30sAOoL5
 uyYdnyO63Kyv1sS966+stTYgvxDUON0cm1bPTkCjYbev8/Yjy0nOPagDU0pJhDm3
 n2CadZ9IGNQZvHGr51RasKDxstEhXN9+uiCLSs+k7UrJijgZcbX4j2iDng7ZIbZU
 c40F+iK7FOAN0NwNoXqRjf7fB1VQswVZMgeGo1dfK2FtnESj+UYc4aDTsClBEtg/
 bSjnitVdaMCU3BUZWanL0hqFTz7zYRNV2y7I34ikH2MMp2guiWrzWI7qYS4ExoyV
 LRwpndG5qJccCvm5ghlhVDNmqwL+IMH7Cu0RL8avJcoUb3cXMJMxQ25rTYN8WPaH
 ZNfP2GVmkLjxy/opWHFXvZN4AbDsv63uoAYqTj+SNOpVeYwCRDhW4i5ojMhkORHd
 ncPLLsVkn7vy2B+mGcwwPXID88iOXUnTPeKqe7XnvKm3N6bGlbH1FGJyba8x/UDa
 t9ZkkIrbj7HtEaC1TLOL
 =+7aN
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Olof Johansson 2014-07-12 09:47:12 -07:00
parent 9641f4084a 02db444db1
commit 2df9ce91e9
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-mmp/include/mach/mfp-pxa910.h
View File

@ -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)