diff options
Diffstat (limited to 'arch/arm/configs/prima2_defconfig')
-rw-r--r-- | arch/arm/configs/prima2_defconfig | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/configs/prima2_defconfig b/arch/arm/configs/prima2_defconfig index c328ac65479a..807d4e2acb17 100644 --- a/arch/arm/configs/prima2_defconfig +++ b/arch/arm/configs/prima2_defconfig | |||
@@ -1,4 +1,6 @@ | |||
1 | CONFIG_EXPERIMENTAL=y | 1 | CONFIG_EXPERIMENTAL=y |
2 | CONFIG_NO_HZ=y | ||
3 | CONFIG_HIGH_RES_TIMERS=y | ||
2 | CONFIG_RELAY=y | 4 | CONFIG_RELAY=y |
3 | CONFIG_BLK_DEV_INITRD=y | 5 | CONFIG_BLK_DEV_INITRD=y |
4 | CONFIG_KALLSYMS_ALL=y | 6 | CONFIG_KALLSYMS_ALL=y |
@@ -8,9 +10,7 @@ CONFIG_MODULE_UNLOAD=y | |||
8 | CONFIG_PARTITION_ADVANCED=y | 10 | CONFIG_PARTITION_ADVANCED=y |
9 | CONFIG_BSD_DISKLABEL=y | 11 | CONFIG_BSD_DISKLABEL=y |
10 | CONFIG_SOLARIS_X86_PARTITION=y | 12 | CONFIG_SOLARIS_X86_PARTITION=y |
11 | CONFIG_ARCH_PRIMA2=y | 13 | CONFIG_ARCH_SIRF=y |
12 | CONFIG_NO_HZ=y | ||
13 | CONFIG_HIGH_RES_TIMERS=y | ||
14 | CONFIG_PREEMPT=y | 14 | CONFIG_PREEMPT=y |
15 | CONFIG_AEABI=y | 15 | CONFIG_AEABI=y |
16 | CONFIG_KEXEC=y | 16 | CONFIG_KEXEC=y |
@@ -36,7 +36,6 @@ CONFIG_SPI=y | |||
36 | CONFIG_SPI_SIRF=y | 36 | CONFIG_SPI_SIRF=y |
37 | CONFIG_SPI_SPIDEV=y | 37 | CONFIG_SPI_SPIDEV=y |
38 | # CONFIG_HWMON is not set | 38 | # CONFIG_HWMON is not set |
39 | # CONFIG_HID_SUPPORT is not set | ||
40 | CONFIG_USB_GADGET=y | 39 | CONFIG_USB_GADGET=y |
41 | CONFIG_USB_FILE_STORAGE=m | 40 | CONFIG_USB_FILE_STORAGE=m |
42 | CONFIG_USB_MASS_STORAGE=m | 41 | CONFIG_USB_MASS_STORAGE=m |