aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-msm/gpiomux.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2013-08-14 12:14:12 +0200
committerIngo Molnar <mingo@kernel.org>2013-08-14 12:14:12 +0200
commit397f09977ea350a20f20b415a9313cc790137742 (patch)
tree0e44f2f3e5804bd5c0c6f644785006b7225e3c94 /arch/arm/mach-msm/gpiomux.h
parent6356bb0ad6525dae93c06478a098ed3848e9ab01 (diff)
parenta4b4bedce880046feeb5b206392960f395ed02ad (diff)
downloadkernel_goldelico_gta04-397f09977ea350a20f20b415a9313cc790137742.zip
kernel_goldelico_gta04-397f09977ea350a20f20b415a9313cc790137742.tar.gz
kernel_goldelico_gta04-397f09977ea350a20f20b415a9313cc790137742.tar.bz2
Merge tag 'amd_f15_m30' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp into x86/ras
Pull AMD F15h, model 0x30 and later enablement stuff, more specifically EDAC support, from Borislav Petkov. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/mach-msm/gpiomux.h')
-rw-r--r--arch/arm/mach-msm/gpiomux.h10
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/mach-msm/gpiomux.h b/arch/arm/mach-msm/gpiomux.h
index 8e82f41..4410d77 100644
--- a/arch/arm/mach-msm/gpiomux.h
+++ b/arch/arm/mach-msm/gpiomux.h
@@ -73,16 +73,6 @@ extern struct msm_gpiomux_config msm_gpiomux_configs[GPIOMUX_NGPIOS];
int msm_gpiomux_write(unsigned gpio,
gpiomux_config_t active,
gpiomux_config_t suspended);
-
-/* Architecture-internal function for use by the framework only.
- * This function can assume the following:
- * - the gpio value has passed a bounds-check
- * - the gpiomux spinlock has been obtained
- *
- * This function is not for public consumption. External users
- * should use msm_gpiomux_write.
- */
-void __msm_gpiomux_write(unsigned gpio, gpiomux_config_t val);
#else
static inline int msm_gpiomux_write(unsigned gpio,
gpiomux_config_t active,