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 master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[pandora-kernel.git]
/
arch
/
arm
/
configs
/
ateb9200_defconfig
diff --git
a/arch/arm/configs/ateb9200_defconfig
b/arch/arm/configs/ateb9200_defconfig
index
15e6b0b
..
baa9769
100644
(file)
--- a/
arch/arm/configs/ateb9200_defconfig
+++ b/
arch/arm/configs/ateb9200_defconfig
@@
-217,7
+217,7
@@
CONFIG_BINFMT_ELF=y
# Power management options
#
CONFIG_PM=y
# Power management options
#
CONFIG_PM=y
-CONFIG_PM_LEGACY=y
+# CONFIG_PM_LEGACY is not set
# CONFIG_PM_DEBUG is not set
# CONFIG_APM is not set
# CONFIG_PM_DEBUG is not set
# CONFIG_APM is not set
@@
-1066,7
+1066,7
@@
CONFIG_RTC_INTF_DEV=y
# CONFIG_RTC_DRV_PCF8563 is not set
# CONFIG_RTC_DRV_RS5C372 is not set
# CONFIG_RTC_DRV_M48T86 is not set
# CONFIG_RTC_DRV_PCF8563 is not set
# CONFIG_RTC_DRV_RS5C372 is not set
# CONFIG_RTC_DRV_M48T86 is not set
-CONFIG_RTC_DRV_AT91=y
+CONFIG_RTC_DRV_AT91
RM9200
=y
# CONFIG_RTC_DRV_TEST is not set
#
# CONFIG_RTC_DRV_TEST is not set
#