From 847db926a5312d23126b6b37e25b08ac9b0cddc1 Mon Sep 17 00:00:00 2001 From: Pranith Kumar Date: Mon, 9 Jun 2014 11:55:24 -0400 Subject: hexagon: update reference, kerneltrap.org no longer works kerneltrap.org no longer works, update to a working reference Signed-off-by: Pranith Kumar Acked-by: Richard Kuo Signed-off-by: Jiri Kosina --- arch/hexagon/include/asm/cache.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch') diff --git a/arch/hexagon/include/asm/cache.h b/arch/hexagon/include/asm/cache.h index f4ca594fdf8c..263511719a4a 100644 --- a/arch/hexagon/include/asm/cache.h +++ b/arch/hexagon/include/asm/cache.h @@ -28,7 +28,7 @@ #define __cacheline_aligned __aligned(L1_CACHE_BYTES) #define ____cacheline_aligned __aligned(L1_CACHE_BYTES) -/* See http://kerneltrap.org/node/15100 */ +/* See http://lwn.net/Articles/262554/ */ #define __read_mostly #endif -- cgit v1.2.3 From 8a7a1558e50cac1004dba19a9bc414c4e9efccba Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Wed, 18 Jun 2014 16:04:44 +0200 Subject: ARM: msm: Remove MSM_SCM Commit 8fc1b0f87d9f ("ARM: qcom: Split Qualcomm support into legacy and multiplatform") removed all users of Kconfig symbol MSM_SCM. Remove that symbol too. Signed-off-by: Paul Bolle Reviewed-by: Stephen Boyd Signed-off-by: Jiri Kosina --- arch/arm/mach-msm/Kconfig | 3 --- 1 file changed, 3 deletions(-) (limited to 'arch') diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig index 9625cf378931..f69fc2ed6be4 100644 --- a/arch/arm/mach-msm/Kconfig +++ b/arch/arm/mach-msm/Kconfig @@ -150,9 +150,6 @@ config MSM_GPIOMUX help Support for MSM V1 TLMM GPIOMUX architecture. -config MSM_SCM - bool - config MSM_TIMER bool -- cgit v1.2.3 From e70cfe4aec0880d45c0ba773123fe18b9d699a64 Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Wed, 11 Jun 2014 12:03:49 +0200 Subject: SH: add proper prompt to SH_MAGIC_PANEL_R2_VERSION Signed-off-by: Paul Bolle Signed-off-by: Jiri Kosina --- arch/sh/boards/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch') diff --git a/arch/sh/boards/Kconfig b/arch/sh/boards/Kconfig index eb1cf84231a2..892c6ce62f4f 100644 --- a/arch/sh/boards/Kconfig +++ b/arch/sh/boards/Kconfig @@ -371,7 +371,7 @@ if SH_MAGIC_PANEL_R2 menu "Magic Panel R2 options" config SH_MAGIC_PANEL_R2_VERSION - int SH_MAGIC_PANEL_R2_VERSION + int "Magic Panel R2 Version" default "3" help Set the version of the Magic Panel R2 -- cgit v1.2.3