diff options
author | Konstantin Porotchkin <kostap@marvell.com> | 2011-04-07 06:49:42 -0400 |
---|---|---|
committer | Nicolas Pitre <nico@fluxnic.net> | 2011-05-03 15:38:52 -0400 |
commit | 0ffd3c4805446dc00a042140443fd7342a35d0b4 (patch) | |
tree | 1fea6a63eb391a12ee36effdf589753e2204dfbe /arch | |
parent | 7b769bb3e859b0de65999468dd1660e3364f8994 (diff) |
ARM: Sync Marvell Dove defconfig with latest kernel
Re-generate defconfig for Marvell Dove platform
Signed-off-by: Konstantin Porotchkin <kostap@marvell.com>
Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/configs/dove_defconfig | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/arm/configs/dove_defconfig b/arch/arm/configs/dove_defconfig index d7c3cfa44774..40db34cf2771 100644 --- a/arch/arm/configs/dove_defconfig +++ b/arch/arm/configs/dove_defconfig | |||
@@ -42,7 +42,6 @@ CONFIG_MTD_UBI=y | |||
42 | CONFIG_BLK_DEV_LOOP=y | 42 | CONFIG_BLK_DEV_LOOP=y |
43 | CONFIG_BLK_DEV_RAM=y | 43 | CONFIG_BLK_DEV_RAM=y |
44 | CONFIG_BLK_DEV_RAM_COUNT=1 | 44 | CONFIG_BLK_DEV_RAM_COUNT=1 |
45 | # CONFIG_MISC_DEVICES is not set | ||
46 | # CONFIG_SCSI_PROC_FS is not set | 45 | # CONFIG_SCSI_PROC_FS is not set |
47 | CONFIG_BLK_DEV_SD=y | 46 | CONFIG_BLK_DEV_SD=y |
48 | # CONFIG_SCSI_LOWLEVEL is not set | 47 | # CONFIG_SCSI_LOWLEVEL is not set |
@@ -57,12 +56,12 @@ CONFIG_INPUT_EVDEV=y | |||
57 | # CONFIG_KEYBOARD_ATKBD is not set | 56 | # CONFIG_KEYBOARD_ATKBD is not set |
58 | # CONFIG_MOUSE_PS2 is not set | 57 | # CONFIG_MOUSE_PS2 is not set |
59 | # CONFIG_SERIO is not set | 58 | # CONFIG_SERIO is not set |
59 | CONFIG_LEGACY_PTY_COUNT=16 | ||
60 | # CONFIG_DEVKMEM is not set | 60 | # CONFIG_DEVKMEM is not set |
61 | CONFIG_SERIAL_8250=y | 61 | CONFIG_SERIAL_8250=y |
62 | CONFIG_SERIAL_8250_CONSOLE=y | 62 | CONFIG_SERIAL_8250_CONSOLE=y |
63 | # CONFIG_SERIAL_8250_PCI is not set | 63 | # CONFIG_SERIAL_8250_PCI is not set |
64 | CONFIG_SERIAL_8250_RUNTIME_UARTS=2 | 64 | CONFIG_SERIAL_8250_RUNTIME_UARTS=2 |
65 | CONFIG_LEGACY_PTY_COUNT=16 | ||
66 | # CONFIG_HW_RANDOM is not set | 65 | # CONFIG_HW_RANDOM is not set |
67 | CONFIG_I2C=y | 66 | CONFIG_I2C=y |
68 | CONFIG_I2C_CHARDEV=y | 67 | CONFIG_I2C_CHARDEV=y |
@@ -70,12 +69,10 @@ CONFIG_I2C_MV64XXX=y | |||
70 | CONFIG_SPI=y | 69 | CONFIG_SPI=y |
71 | CONFIG_SPI_ORION=y | 70 | CONFIG_SPI_ORION=y |
72 | # CONFIG_HWMON is not set | 71 | # CONFIG_HWMON is not set |
73 | # CONFIG_VGA_CONSOLE is not set | ||
74 | CONFIG_USB=y | 72 | CONFIG_USB=y |
75 | CONFIG_USB_DEVICEFS=y | 73 | CONFIG_USB_DEVICEFS=y |
76 | CONFIG_USB_EHCI_HCD=y | 74 | CONFIG_USB_EHCI_HCD=y |
77 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 75 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
78 | CONFIG_USB_EHCI_TT_NEWSCHED=y | ||
79 | CONFIG_USB_STORAGE=y | 76 | CONFIG_USB_STORAGE=y |
80 | CONFIG_RTC_CLASS=y | 77 | CONFIG_RTC_CLASS=y |
81 | CONFIG_RTC_DRV_MV=y | 78 | CONFIG_RTC_DRV_MV=y |
@@ -84,7 +81,6 @@ CONFIG_MV_XOR=y | |||
84 | CONFIG_EXT2_FS=y | 81 | CONFIG_EXT2_FS=y |
85 | CONFIG_EXT3_FS=y | 82 | CONFIG_EXT3_FS=y |
86 | # CONFIG_EXT3_FS_XATTR is not set | 83 | # CONFIG_EXT3_FS_XATTR is not set |
87 | CONFIG_INOTIFY=y | ||
88 | CONFIG_ISO9660_FS=y | 84 | CONFIG_ISO9660_FS=y |
89 | CONFIG_JOLIET=y | 85 | CONFIG_JOLIET=y |
90 | CONFIG_UDF_FS=m | 86 | CONFIG_UDF_FS=m |
@@ -108,23 +104,19 @@ CONFIG_DEBUG_KERNEL=y | |||
108 | CONFIG_TIMER_STATS=y | 104 | CONFIG_TIMER_STATS=y |
109 | # CONFIG_DEBUG_BUGVERBOSE is not set | 105 | # CONFIG_DEBUG_BUGVERBOSE is not set |
110 | CONFIG_DEBUG_INFO=y | 106 | CONFIG_DEBUG_INFO=y |
111 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
112 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 107 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
113 | CONFIG_DEBUG_USER=y | 108 | CONFIG_DEBUG_USER=y |
114 | CONFIG_DEBUG_ERRORS=y | 109 | CONFIG_DEBUG_ERRORS=y |
115 | CONFIG_CRYPTO_NULL=y | 110 | CONFIG_CRYPTO_NULL=y |
116 | CONFIG_CRYPTO_CBC=y | ||
117 | CONFIG_CRYPTO_ECB=m | 111 | CONFIG_CRYPTO_ECB=m |
118 | CONFIG_CRYPTO_PCBC=m | 112 | CONFIG_CRYPTO_PCBC=m |
119 | CONFIG_CRYPTO_HMAC=y | 113 | CONFIG_CRYPTO_HMAC=y |
120 | CONFIG_CRYPTO_MD4=y | 114 | CONFIG_CRYPTO_MD4=y |
121 | CONFIG_CRYPTO_MD5=y | ||
122 | CONFIG_CRYPTO_SHA1=y | 115 | CONFIG_CRYPTO_SHA1=y |
123 | CONFIG_CRYPTO_SHA256=y | 116 | CONFIG_CRYPTO_SHA256=y |
124 | CONFIG_CRYPTO_SHA512=y | 117 | CONFIG_CRYPTO_SHA512=y |
125 | CONFIG_CRYPTO_AES=y | 118 | CONFIG_CRYPTO_AES=y |
126 | CONFIG_CRYPTO_BLOWFISH=y | 119 | CONFIG_CRYPTO_BLOWFISH=y |
127 | CONFIG_CRYPTO_DES=y | ||
128 | CONFIG_CRYPTO_TEA=y | 120 | CONFIG_CRYPTO_TEA=y |
129 | CONFIG_CRYPTO_TWOFISH=y | 121 | CONFIG_CRYPTO_TWOFISH=y |
130 | CONFIG_CRYPTO_DEFLATE=y | 122 | CONFIG_CRYPTO_DEFLATE=y |