git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'battery-2.6.34', 'bugzilla-10805', 'bugzilla-14668', 'bugzilla-531916...
[pandora-kernel.git]
/
arch
/
arm
/
configs
/
mini2440_defconfig
diff --git
a/arch/arm/configs/mini2440_defconfig
b/arch/arm/configs/mini2440_defconfig
index
4c46644
..
ff44bd1
100644
(file)
--- a/
arch/arm/configs/mini2440_defconfig
+++ b/
arch/arm/configs/mini2440_defconfig
@@
-199,8
+199,8
@@
CONFIG_S3C_BOOT_UART_FORCE_FIFO=y
#
# Power management
#
-# CONFIG_S
3C2410
_PM_DEBUG is not set
-# CONFIG_S
3C2410
_PM_CHECK is not set
+# CONFIG_S
AMSUNG
_PM_DEBUG is not set
+# CONFIG_S
AMSUNG
_PM_CHECK is not set
CONFIG_S3C_LOWLEVEL_UART_PORT=0
CONFIG_S3C_GPIO_SPACE=0