diff --git a/[refs] b/[refs] index 7a0658eee000..4177ddbdbb77 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8294e2362fa1ce8a172a32ae8607d35563e8b043 +refs/heads/master: c5ee1211f249b0897f715aba4647c1f494509cab diff --git a/trunk/drivers/staging/android/Kconfig b/trunk/drivers/staging/android/Kconfig index 20034e6e63e4..3144ddb329aa 100644 --- a/trunk/drivers/staging/android/Kconfig +++ b/trunk/drivers/staging/android/Kconfig @@ -30,11 +30,6 @@ config ANDROID_RAM_CONSOLE depends on !S390 && !UML default n -config ANDROID_RAM_CONSOLE_ENABLE_VERBOSE - bool "Enable verbose console messages on Android RAM console" - default y - depends on ANDROID_RAM_CONSOLE - menuconfig ANDROID_RAM_CONSOLE_ERROR_CORRECTION bool "Android RAM Console Enable error correction" default n diff --git a/trunk/drivers/staging/android/ram_console.c b/trunk/drivers/staging/android/ram_console.c index ed7827bded15..73215e2ee204 100644 --- a/trunk/drivers/staging/android/ram_console.c +++ b/trunk/drivers/staging/android/ram_console.c @@ -285,9 +285,6 @@ static int __init ram_console_init(struct ram_console_buffer *buffer, buffer->size = 0; register_console(&ram_console); -#ifdef CONFIG_ANDROID_RAM_CONSOLE_ENABLE_VERBOSE - console_verbose(); -#endif return 0; }