summaryrefslogtreecommitdiffstats
path: root/config-arm-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2011-10-31 15:20:40 -0400
committerJosh Boyer <jwboyer@redhat.com>2011-10-31 15:20:40 -0400
commit8e04ce5a387af9a033773520fa7c07b705e081c6 (patch)
tree5c7669fe0426c9b373df7101967fbecaeeb60f40 /config-arm-generic
parentdff08547967b51d0c1a79626647971c508e4106e (diff)
downloadkernel-8e04ce5a387af9a033773520fa7c07b705e081c6.tar.gz
kernel-8e04ce5a387af9a033773520fa7c07b705e081c6.tar.xz
kernel-8e04ce5a387af9a033773520fa7c07b705e081c6.zip
Linux 3.1-git3. Happy Halloween.
Diffstat (limited to 'config-arm-generic')
-rw-r--r--config-arm-generic3
1 files changed, 3 insertions, 0 deletions
diff --git a/config-arm-generic b/config-arm-generic
index a41f9544d..19e9af451 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -44,6 +44,8 @@ CONFIG_OABI_COMPAT=y
# CONFIG_UACCESS_WITH_MEMCPY is not set
+CONFIG_ARM_APPENDED_DTB=y
+CONFIG_ARM_ATAG_DTB_COMPAT=y
CONFIG_CMDLINE="console=ttyAM0,115200 root=/dev/sda1 rootdelay=20"
CONFIG_NO_HZ=y
@@ -172,3 +174,4 @@ CONFIG_FTGMAC100=m
# CONFIG_DRM_RADEON is not set
# CONFIG_ATM_HE is not set
# CONFIG_SCSI_ACARD is not set
+# CONFIG_ARM_KPROBES_TEST is not set