diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-29 09:25:08 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-29 09:27:44 -0800 |
| commit | 5edda2afb1a90af3843b74f64ed7fe9c5c80493b (patch) | |
| tree | fa2d362341dcf2b791893796a2cc9dac8a4ed1c5 /arch/arm/configs | |
| parent | 51063a4ed955f82f408fc33cd9cc758e65a88808 (diff) | |
| parent | 6c7c23cc7f1b0d690d8c113252c19b38a2227419 (diff) | |
Merge tag 'davinci-for-v3.9/board' of git://gitorious.org/linux-davinci/linux-davinci into next/boards
From Sekhar Nori:
DaVinci board updates for v3.9
This pull request has defconfig changes which enable
newer filesystems to boot on DaVinci and also enable
runtime pm by default.
Another patch is included to cleanup a checkpatch error
in existing board files.
* tag 'davinci-for-v3.9/board' of git://gitorious.org/linux-davinci/linux-davinci:
ARM: davinci: da850 board: change pr_warning() to pr_warn()
ARM: davinci: defconfig: enable pm_runtime
ARM: davinci: defconfig: enable devtmpfs and devtmpfs automount
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/da8xx_omapl_defconfig | 3 | ||||
| -rw-r--r-- | arch/arm/configs/davinci_all_defconfig | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/configs/da8xx_omapl_defconfig b/arch/arm/configs/da8xx_omapl_defconfig index f29223954af..6b36a5ae03c 100644 --- a/arch/arm/configs/da8xx_omapl_defconfig +++ b/arch/arm/configs/da8xx_omapl_defconfig @@ -36,6 +36,7 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=m CONFIG_CPU_FREQ_GOV_POWERSAVE=m CONFIG_CPU_FREQ_GOV_ONDEMAND=m CONFIG_CPU_IDLE=y +CONFIG_PM_RUNTIME=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y @@ -45,6 +46,8 @@ CONFIG_IP_PNP_DHCP=y # CONFIG_INET_LRO is not set CONFIG_NETFILTER=y CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y # CONFIG_FW_LOADER is not set CONFIG_BLK_DEV_LOOP=m CONFIG_BLK_DEV_RAM=y diff --git a/arch/arm/configs/davinci_all_defconfig b/arch/arm/configs/davinci_all_defconfig index 4ea7c95719d..3edc78a40b6 100644 --- a/arch/arm/configs/davinci_all_defconfig +++ b/arch/arm/configs/davinci_all_defconfig @@ -33,6 +33,7 @@ CONFIG_AEABI=y CONFIG_LEDS=y CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_PM_RUNTIME=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y @@ -42,6 +43,8 @@ CONFIG_IP_PNP_DHCP=y # CONFIG_INET_LRO is not set CONFIG_NETFILTER=y CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y # CONFIG_FW_LOADER is not set CONFIG_MTD=m CONFIG_MTD_PARTITIONS=y |