diff options
| author | Jon Medhurst <tixy@linaro.org> | 2012-12-20 19:25:56 +0000 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2012-12-20 19:25:56 +0000 |
| commit | c0f99b54c15a5ce6567b3ac92e1ba4426a21ef66 (patch) | |
| tree | 98e37a64bd3753d8e5c34f947618ac8c7b058d68 | |
| parent | 62a0eb1bfdbf892e07989fc862c3111f3b8599f3 (diff) | |
| parent | 407824b0d3514a8bed9815301fa87c0dd827882e (diff) | |
| download | linux-linaro-tracking-with-fixes-c0f99b54c15a5ce6567b3ac92e1ba4426a21ef66.tar.gz | |
Merge branch 'tracking-armlt-arm64' into integration-linaro-vexpresstracking-integration-linaro-vexpress-ll-20121221.1tracking-integration-linaro-vexpress-ll-20121221.0
| -rw-r--r-- | arch/arm64/configs/vexpress-android_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/configs/vexpress-android_defconfig b/arch/arm64/configs/vexpress-android_defconfig index 1ab7b5ea304..3c876dcca8f 100644 --- a/arch/arm64/configs/vexpress-android_defconfig +++ b/arch/arm64/configs/vexpress-android_defconfig @@ -259,7 +259,7 @@ CONFIG_CROSS_MEMORY_ATTACH=y # # Boot options # -CONFIG_CMDLINE="console=ttyAMA0 video=ambafb loglevel=8" +CONFIG_CMDLINE="console=ttyAMA0 androidboot.console=ttyAMA0 video=ambafb loglevel=8" CONFIG_CMDLINE_FORCE=y # |