diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-12-12 00:17:55 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-12-12 00:17:55 +0100 |
| commit | 80f7273c05b3447c5890ee6eb639d7c49ce100d7 (patch) | |
| tree | 478a948e76d8f660b0f3b898c1094df5b172e433 /include/linux | |
| parent | 31ade3b83e1821da5fbb2f11b5b3d4ab2ec39db8 (diff) | |
| parent | e324654294907a420ab3773efe8849a935f37bf0 (diff) | |
Merge branch 'treewide/cleanup' into next/cleanup
These are a couple of changes that may conflict with other branches,
so we're keeping them in a separate branch that can be merged into
those if necessary.
* treewide/cleanup:
ARM: use "depends on" for SoC configs instead of "if" after prompt
ARM/clocksource: use automatic DT probing for ux500 PRCMU
ARM: use const and __initconst for smp_operations
ARM: hisi: do not export smp_operations structures
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/clksrc-dbx500-prcmu.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/include/linux/clksrc-dbx500-prcmu.h b/include/linux/clksrc-dbx500-prcmu.h deleted file mode 100644 index 4fb8119c49e4..000000000000 --- a/include/linux/clksrc-dbx500-prcmu.h +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (C) ST-Ericsson SA 2011 - * - * License Terms: GNU General Public License v2 - * Author: Mattias Wallin <mattias.wallin@stericsson.com> - * - */ -#ifndef __CLKSRC_DBX500_PRCMU_H -#define __CLKSRC_DBX500_PRCMU_H - -#include <linux/init.h> -#include <linux/io.h> - -#ifdef CONFIG_CLKSRC_DBX500_PRCMU -void __init clksrc_dbx500_prcmu_init(void __iomem *base); -#else -static inline void __init clksrc_dbx500_prcmu_init(void __iomem *base) {} -#endif - -#endif |