diff options
| author | Colin Cross <ccross@android.com> | 2010-10-06 16:31:32 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2010-10-06 16:32:09 -0700 |
| commit | 98959c85632cde43fc83ba1b709f767fc3b8a4ee (patch) | |
| tree | be7912bc7cd8c2aab86922da933439ff951ab602 /arch/arm/boot/compressed/misc.c | |
| parent | 5c4a97667fdf6705d6c9f9e4b42dd7deb4da6978 (diff) | |
| parent | df5ac72e83df9fd8d735d40d5be464d4b66d6074 (diff) | |
Merge branch 'android-2.6.36' into android-tegra-2.6.36
Conflicts:
drivers/input/touchscreen/Kconfig
Change-Id: Ifc75266e258f9513d78c47c12e2f1de1d2344f02
Diffstat (limited to 'arch/arm/boot/compressed/misc.c')
| -rw-r--r-- | arch/arm/boot/compressed/misc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c index e653a6d3c8d9..253ecc88a7bb 100644 --- a/arch/arm/boot/compressed/misc.c +++ b/arch/arm/boot/compressed/misc.c @@ -36,7 +36,7 @@ extern void error(char *x); #ifdef CONFIG_DEBUG_ICEDCC -#ifdef CONFIG_CPU_V6 +#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V7) static void icedcc_putc(int ch) { |