diff options
-rw-r--r-- | arch/arm/configs/ams_delta_defconfig | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/arch/arm/configs/ams_delta_defconfig b/arch/arm/configs/ams_delta_defconfig index 764732529ea3..e8f7380b67d6 100644 --- a/arch/arm/configs/ams_delta_defconfig +++ b/arch/arm/configs/ams_delta_defconfig | |||
@@ -55,10 +55,10 @@ CONFIG_BLK_DEV_INITRD=y | |||
55 | CONFIG_INITRAMFS_SOURCE="" | 55 | CONFIG_INITRAMFS_SOURCE="" |
56 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 56 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
57 | CONFIG_SYSCTL=y | 57 | CONFIG_SYSCTL=y |
58 | # CONFIG_EMBEDDED is not set | 58 | CONFIG_EMBEDDED=y |
59 | CONFIG_UID16=y | 59 | CONFIG_UID16=y |
60 | CONFIG_SYSCTL_SYSCALL=y | 60 | CONFIG_SYSCTL_SYSCALL=y |
61 | CONFIG_KALLSYMS=y | 61 | # CONFIG_KALLSYMS is not set |
62 | # CONFIG_KALLSYMS_ALL is not set | 62 | # CONFIG_KALLSYMS_ALL is not set |
63 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 63 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
64 | CONFIG_HOTPLUG=y | 64 | CONFIG_HOTPLUG=y |
@@ -224,7 +224,7 @@ CONFIG_CPU_CP15_MMU=y | |||
224 | # | 224 | # |
225 | # Processor Features | 225 | # Processor Features |
226 | # | 226 | # |
227 | # CONFIG_ARM_THUMB is not set | 227 | CONFIG_ARM_THUMB=y |
228 | # CONFIG_CPU_ICACHE_DISABLE is not set | 228 | # CONFIG_CPU_ICACHE_DISABLE is not set |
229 | # CONFIG_CPU_DCACHE_DISABLE is not set | 229 | # CONFIG_CPU_DCACHE_DISABLE is not set |
230 | CONFIG_CPU_DCACHE_WRITETHROUGH=y | 230 | CONFIG_CPU_DCACHE_WRITETHROUGH=y |
@@ -248,7 +248,7 @@ CONFIG_CPU_DCACHE_WRITETHROUGH=y | |||
248 | # CONFIG_HIGH_RES_TIMERS is not set | 248 | # CONFIG_HIGH_RES_TIMERS is not set |
249 | CONFIG_PREEMPT=y | 249 | CONFIG_PREEMPT=y |
250 | CONFIG_HZ=100 | 250 | CONFIG_HZ=100 |
251 | # CONFIG_AEABI is not set | 251 | CONFIG_AEABI=y |
252 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 252 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set |
253 | CONFIG_SELECT_MEMORY_MODEL=y | 253 | CONFIG_SELECT_MEMORY_MODEL=y |
254 | CONFIG_FLATMEM_MANUAL=y | 254 | CONFIG_FLATMEM_MANUAL=y |
@@ -299,7 +299,9 @@ CONFIG_BINFMT_ELF=y | |||
299 | # | 299 | # |
300 | # Power management options | 300 | # Power management options |
301 | # | 301 | # |
302 | # CONFIG_PM is not set | 302 | CONFIG_PM=y |
303 | # CONFIG_SUSPEND is not set | ||
304 | CONFIG_PM_RUNTIME=y | ||
303 | 305 | ||
304 | # | 306 | # |
305 | # Networking | 307 | # Networking |
@@ -670,7 +672,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | |||
670 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | 672 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 |
671 | # CONFIG_INPUT_JOYDEV is not set | 673 | # CONFIG_INPUT_JOYDEV is not set |
672 | # CONFIG_INPUT_TSDEV is not set | 674 | # CONFIG_INPUT_TSDEV is not set |
673 | # CONFIG_INPUT_EVDEV is not set | 675 | CONFIG_INPUT_EVDEV=y |
674 | # CONFIG_INPUT_EVBUG is not set | 676 | # CONFIG_INPUT_EVBUG is not set |
675 | 677 | ||
676 | # | 678 | # |
@@ -784,6 +786,7 @@ CONFIG_I2C_OMAP=y | |||
784 | # | 786 | # |
785 | # CONFIG_SPI is not set | 787 | # CONFIG_SPI is not set |
786 | # CONFIG_SPI_MASTER is not set | 788 | # CONFIG_SPI_MASTER is not set |
789 | CONFIG_GPIO_SYSFS=y | ||
787 | 790 | ||
788 | # | 791 | # |
789 | # Dallas's 1-wire bus | 792 | # Dallas's 1-wire bus |
@@ -820,6 +823,7 @@ CONFIG_LEDS_AMS_DELTA=y | |||
820 | CONFIG_LEDS_TRIGGERS=y | 823 | CONFIG_LEDS_TRIGGERS=y |
821 | CONFIG_LEDS_TRIGGER_TIMER=y | 824 | CONFIG_LEDS_TRIGGER_TIMER=y |
822 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y | 825 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y |
826 | CONFIG_LEDS_TRIGGER_DEFAULT_ON=y | ||
823 | 827 | ||
824 | # | 828 | # |
825 | # Multimedia devices | 829 | # Multimedia devices |
@@ -896,7 +900,13 @@ CONFIG_LOGO_LINUX_CLUT224=y | |||
896 | # | 900 | # |
897 | # Sound | 901 | # Sound |
898 | # | 902 | # |
899 | # CONFIG_SOUND is not set | 903 | CONFIG_SOUND=y |
904 | CONFIG_SND=y | ||
905 | CONFIG_SND_MIXER_OSS=y | ||
906 | CONFIG_SND_PCM_OSS=y | ||
907 | CONFIG_SND_SOC=y | ||
908 | CONFIG_SND_OMAP_SOC=y | ||
909 | CONFIG_SND_OMAP_SOC_AMS_DELTA=y | ||
900 | 910 | ||
901 | # | 911 | # |
902 | # HID Devices | 912 | # HID Devices |