ram_console/lmk: cosmetic clean up

dazjo · Oct 3, 2013 · a7ee708 · a7ee708
1 parent 3b698d6
commit a7ee708
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 16 deletions.
diff --git a/arch/arm/configs/cyanogenmod_u8815_defconfig b/arch/arm/configs/cyanogenmod_u8815_defconfig
@@ -2538,7 +2538,6 @@ CONFIG_ANDROID_RAM_CONSOLE=y
 CONFIG_ANDROID_TIMED_OUTPUT=y
 # CONFIG_ANDROID_TIMED_GPIO is not set
 CONFIG_ANDROID_LOW_MEMORY_KILLER=y
-CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES=y
 # CONFIG_POHMELFS is not set
 # CONFIG_LINE6_USB is not set
 # CONFIG_VT6656 is not set

diff --git a/arch/arm/mach-msm/board-msm7x27a.c b/arch/arm/mach-msm/board-msm7x27a.c
@@ -87,15 +87,15 @@ static ssize_t  buf_vkey_size=0;
 
 #ifdef CONFIG_ANDROID_RAM_CONSOLE
 struct persistent_ram_descriptor ram_console_desc = {
-        .name = "ram_console",
-        .size = MSM_RAM_CONSOLE_SIZE - 1,
+	.name = "ram_console",
+	.size = MSM_RAM_CONSOLE_SIZE - 1,
 };
 
 struct persistent_ram ram_console_ram = {
-        .start = MSM_RAM_CONSOLE_START,
-        .size = MSM_RAM_CONSOLE_SIZE - 1,
-        .num_descs = 1,
-        .descs = &ram_console_desc,
+	.start = MSM_RAM_CONSOLE_START,
+	.size = MSM_RAM_CONSOLE_SIZE - 1,
+	.num_descs = 1,
+	.descs = &ram_console_desc,
 };
 
 static struct platform_device ram_console_device = {

diff --git a/drivers/staging/android/Kconfig b/drivers/staging/android/Kconfig
@@ -58,15 +58,6 @@ config ANDROID_LOW_MEMORY_KILLER
 	---help---
 	  Register processes to be killed when memory is low
 
-config ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES
-	bool "Android Low Memory Killer: detect oom_adj values"
-	depends on ANDROID_LOW_MEMORY_KILLER
-	default y
-	---help---
-	  Detect oom_adj values written to
-	  /sys/module/lowmemorykiller/parameters/adj and convert them
-	  to oom_score_adj values.
-
 endif # if ANDROID
 
 endmenu