aboutsummaryrefslogtreecommitdiffstats
path: root/arch/blackfin/configs
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2010-10-24 14:11:50 -0400
committerMike Frysinger <vapier@gentoo.org>2010-10-25 04:54:33 -0400
commit10cbb0ba4282407ee3c4a09552d80941bfdfeb77 (patch)
tree324d1949e42636e27169cd6df55f151de2025b76 /arch/blackfin/configs
parent61c16b5c7414b6d0511dc384e0ea994e250e6339 (diff)
Blackfin: update defconfigs
- enable pm for ADI boards - drop security option as no one uses it - enable uninitialized mmap for everyone - disable wireless by default as no one uses it - disable cfq io sched as noop is fine Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch/blackfin/configs')
-rw-r--r--arch/blackfin/configs/BF518F-EZBRD_defconfig2
-rw-r--r--arch/blackfin/configs/BF526-EZBRD_defconfig2
-rw-r--r--arch/blackfin/configs/BF527-AD7160-EVAL_defconfig2
-rw-r--r--arch/blackfin/configs/BF527-EZKIT-V2_defconfig3
-rw-r--r--arch/blackfin/configs/BF527-EZKIT_defconfig3
-rw-r--r--arch/blackfin/configs/BF527-TLL6527M_defconfig1
-rw-r--r--arch/blackfin/configs/BF533-EZKIT_defconfig2
-rw-r--r--arch/blackfin/configs/BF533-STAMP_defconfig2
-rw-r--r--arch/blackfin/configs/BF537-STAMP_defconfig3
-rw-r--r--arch/blackfin/configs/BF538-EZKIT_defconfig3
-rw-r--r--arch/blackfin/configs/BF548-EZKIT_defconfig4
-rw-r--r--arch/blackfin/configs/BF561-ACVILON_defconfig4
-rw-r--r--arch/blackfin/configs/BF561-EZKIT_defconfig1
-rw-r--r--arch/blackfin/configs/BlackStamp_defconfig3
-rw-r--r--arch/blackfin/configs/CM-BF527_defconfig4
-rw-r--r--arch/blackfin/configs/CM-BF533_defconfig3
-rw-r--r--arch/blackfin/configs/CM-BF537E_defconfig3
-rw-r--r--arch/blackfin/configs/CM-BF537U_defconfig3
-rw-r--r--arch/blackfin/configs/CM-BF548_defconfig3
-rw-r--r--arch/blackfin/configs/CM-BF561_defconfig3
-rw-r--r--arch/blackfin/configs/H8606_defconfig3
-rw-r--r--arch/blackfin/configs/IP0X_defconfig3
-rw-r--r--arch/blackfin/configs/PNAV-10_defconfig2
-rw-r--r--arch/blackfin/configs/SRV1_defconfig3
-rw-r--r--arch/blackfin/configs/TCM-BF518_defconfig1
-rw-r--r--arch/blackfin/configs/TCM-BF537_defconfig2
26 files changed, 42 insertions, 26 deletions
diff --git a/arch/blackfin/configs/BF518F-EZBRD_defconfig b/arch/blackfin/configs/BF518F-EZBRD_defconfig
index 46fac1bf0605..c0b988ee30df 100644
--- a/arch/blackfin/configs/BF518F-EZBRD_defconfig
+++ b/arch/blackfin/configs/BF518F-EZBRD_defconfig
@@ -35,6 +35,7 @@ CONFIG_C_CDPRIO=y
35CONFIG_BANK_3=0x99B2 35CONFIG_BANK_3=0x99B2
36CONFIG_BINFMT_FLAT=y 36CONFIG_BINFMT_FLAT=y
37CONFIG_BINFMT_ZFLAT=y 37CONFIG_BINFMT_ZFLAT=y
38CONFIG_PM=y
38CONFIG_NET=y 39CONFIG_NET=y
39CONFIG_PACKET=y 40CONFIG_PACKET=y
40CONFIG_UNIX=y 41CONFIG_UNIX=y
@@ -114,7 +115,6 @@ CONFIG_DEBUG_DOUBLEFAULT=y
114CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE=y 115CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE=y
115CONFIG_EARLY_PRINTK=y 116CONFIG_EARLY_PRINTK=y
116CONFIG_CPLB_INFO=y 117CONFIG_CPLB_INFO=y
117CONFIG_SECURITY=y
118CONFIG_CRYPTO=y 118CONFIG_CRYPTO=y
119# CONFIG_CRYPTO_ANSI_CPRNG is not set 119# CONFIG_CRYPTO_ANSI_CPRNG is not set
120CONFIG_CRC_CCITT=m 120CONFIG_CRC_CCITT=m
diff --git a/arch/blackfin/configs/BF526-EZBRD_defconfig b/arch/blackfin/configs/BF526-EZBRD_defconfig
index 80240806cf9e..864af5b68874 100644
--- a/arch/blackfin/configs/BF526-EZBRD_defconfig
+++ b/arch/blackfin/configs/BF526-EZBRD_defconfig
@@ -40,6 +40,7 @@ CONFIG_C_CDPRIO=y
40CONFIG_BANK_3=0x99B2 40CONFIG_BANK_3=0x99B2
41CONFIG_BINFMT_FLAT=y 41CONFIG_BINFMT_FLAT=y
42CONFIG_BINFMT_ZFLAT=y 42CONFIG_BINFMT_ZFLAT=y
43CONFIG_PM=y
43CONFIG_NET=y 44CONFIG_NET=y
44CONFIG_PACKET=y 45CONFIG_PACKET=y
45CONFIG_UNIX=y 46CONFIG_UNIX=y
@@ -152,7 +153,6 @@ CONFIG_DEBUG_DOUBLEFAULT=y
152CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE=y 153CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE=y
153CONFIG_EARLY_PRINTK=y 154CONFIG_EARLY_PRINTK=y
154CONFIG_CPLB_INFO=y 155CONFIG_CPLB_INFO=y
155CONFIG_SECURITY=y
156CONFIG_CRYPTO=y 156CONFIG_CRYPTO=y
157# CONFIG_CRYPTO_ANSI_CPRNG is not set 157# CONFIG_CRYPTO_ANSI_CPRNG is not set
158CONFIG_CRC_CCITT=m 158CONFIG_CRC_CCITT=m
diff --git a/arch/blackfin/configs/BF527-AD7160-EVAL_defconfig b/arch/blackfin/configs/BF527-AD7160-EVAL_defconfig
index 08c55f6b8b7a..7b6a3370dbe2 100644
--- a/arch/blackfin/configs/BF527-AD7160-EVAL_defconfig
+++ b/arch/blackfin/configs/BF527-AD7160-EVAL_defconfig
@@ -9,6 +9,7 @@ CONFIG_EMBEDDED=y
9# CONFIG_ELF_CORE is not set 9# CONFIG_ELF_CORE is not set
10# CONFIG_AIO is not set 10# CONFIG_AIO is not set
11CONFIG_SLAB=y 11CONFIG_SLAB=y
12CONFIG_MMAP_ALLOW_UNINITIALIZED=y
12CONFIG_MODULES=y 13CONFIG_MODULES=y
13CONFIG_MODULE_UNLOAD=y 14CONFIG_MODULE_UNLOAD=y
14# CONFIG_BLK_DEV_BSG is not set 15# CONFIG_BLK_DEV_BSG is not set
@@ -101,5 +102,4 @@ CONFIG_DETECT_HUNG_TASK=y
101# CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set 102# CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set
102CONFIG_EARLY_PRINTK=y 103CONFIG_EARLY_PRINTK=y
103CONFIG_CPLB_INFO=y 104CONFIG_CPLB_INFO=y
104CONFIG_SECURITY=y
105CONFIG_CRC_CCITT=m 105CONFIG_CRC_CCITT=m
diff --git a/arch/blackfin/configs/BF527-EZKIT-V2_defconfig b/arch/blackfin/configs/BF527-EZKIT-V2_defconfig
index 4a9125558fcf..4faa6b46a352 100644
--- a/arch/blackfin/configs/BF527-EZKIT-V2_defconfig
+++ b/arch/blackfin/configs/BF527-EZKIT-V2_defconfig
@@ -20,6 +20,7 @@ CONFIG_MODULE_UNLOAD=y
20# CONFIG_LBDAF is not set 20# CONFIG_LBDAF is not set
21# CONFIG_BLK_DEV_BSG is not set 21# CONFIG_BLK_DEV_BSG is not set
22# CONFIG_IOSCHED_DEADLINE is not set 22# CONFIG_IOSCHED_DEADLINE is not set
23# CONFIG_IOSCHED_CFQ is not set
23CONFIG_PREEMPT_VOLUNTARY=y 24CONFIG_PREEMPT_VOLUNTARY=y
24CONFIG_BF527=y 25CONFIG_BF527=y
25CONFIG_BF_REV_0_2=y 26CONFIG_BF_REV_0_2=y
@@ -38,6 +39,7 @@ CONFIG_C_CDPRIO=y
38CONFIG_BANK_3=0x99B2 39CONFIG_BANK_3=0x99B2
39CONFIG_BINFMT_FLAT=y 40CONFIG_BINFMT_FLAT=y
40CONFIG_BINFMT_ZFLAT=y 41CONFIG_BINFMT_ZFLAT=y
42CONFIG_PM=y
41CONFIG_NET=y 43CONFIG_NET=y
42CONFIG_PACKET=y 44CONFIG_PACKET=y
43CONFIG_UNIX=y 45CONFIG_UNIX=y
@@ -181,6 +183,5 @@ CONFIG_DEBUG_DOUBLEFAULT=y
181CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE=y 183CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE=y
182CONFIG_EARLY_PRINTK=y 184CONFIG_EARLY_PRINTK=y
183CONFIG_CPLB_INFO=y 185CONFIG_CPLB_INFO=y
184CONFIG_SECURITY=y
185CONFIG_CRYPTO=y 186CONFIG_CRYPTO=y
186# CONFIG_CRYPTO_ANSI_CPRNG is not set 187# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/blackfin/configs/BF527-EZKIT_defconfig b/arch/blackfin/configs/BF527-EZKIT_defconfig
index 8ccf3cec7534..9d893eb68243 100644
--- a/arch/blackfin/configs/BF527-EZKIT_defconfig
+++ b/arch/blackfin/configs/BF527-EZKIT_defconfig
@@ -20,6 +20,7 @@ CONFIG_MODULE_UNLOAD=y
20# CONFIG_LBDAF is not set 20# CONFIG_LBDAF is not set
21# CONFIG_BLK_DEV_BSG is not set 21# CONFIG_BLK_DEV_BSG is not set
22# CONFIG_IOSCHED_DEADLINE is not set 22# CONFIG_IOSCHED_DEADLINE is not set
23# CONFIG_IOSCHED_CFQ is not set
23CONFIG_PREEMPT_VOLUNTARY=y 24CONFIG_PREEMPT_VOLUNTARY=y
24CONFIG_BF527=y 25CONFIG_BF527=y
25CONFIG_BF_REV_0_1=y 26CONFIG_BF_REV_0_1=y
@@ -37,6 +38,7 @@ CONFIG_C_CDPRIO=y
37CONFIG_BANK_3=0x99B2 38CONFIG_BANK_3=0x99B2
38CONFIG_BINFMT_FLAT=y 39CONFIG_BINFMT_FLAT=y
39CONFIG_BINFMT_ZFLAT=y 40CONFIG_BINFMT_ZFLAT=y
41CONFIG_PM=y
40CONFIG_NET=y 42CONFIG_NET=y
41CONFIG_PACKET=y 43CONFIG_PACKET=y
42CONFIG_UNIX=y 44CONFIG_UNIX=y
@@ -173,6 +175,5 @@ CONFIG_DEBUG_DOUBLEFAULT=y
173CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE=y 175CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE=y
174CONFIG_EARLY_PRINTK=y 176CONFIG_EARLY_PRINTK=y
175CONFIG_CPLB_INFO=y 177CONFIG_CPLB_INFO=y
176CONFIG_SECURITY=y
177CONFIG_CRYPTO=y 178CONFIG_CRYPTO=y
178# CONFIG_CRYPTO_ANSI_CPRNG is not set 179# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/blackfin/configs/BF527-TLL6527M_defconfig b/arch/blackfin/configs/BF527-TLL6527M_defconfig
index 92ded5edc86c..97a2767c80f8 100644
--- a/arch/blackfin/configs/BF527-TLL6527M_defconfig
+++ b/arch/blackfin/configs/BF527-TLL6527M_defconfig
@@ -174,7 +174,6 @@ CONFIG_DEBUG_DOUBLEFAULT=y
174CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE=y 174CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE=y
175CONFIG_EARLY_PRINTK=y 175CONFIG_EARLY_PRINTK=y
176CONFIG_CPLB_INFO=y 176CONFIG_CPLB_INFO=y
177CONFIG_SECURITY=y
178CONFIG_CRYPTO=y 177CONFIG_CRYPTO=y
179# CONFIG_CRYPTO_ANSI_CPRNG is not set 178# CONFIG_CRYPTO_ANSI_CPRNG is not set
180CONFIG_CRC7=m 179CONFIG_CRC7=m
diff --git a/arch/blackfin/configs/BF533-EZKIT_defconfig b/arch/blackfin/configs/BF533-EZKIT_defconfig
index c40e0f1c7eac..f84774360c5b 100644
--- a/arch/blackfin/configs/BF533-EZKIT_defconfig
+++ b/arch/blackfin/configs/BF533-EZKIT_defconfig
@@ -20,6 +20,7 @@ CONFIG_MODULE_UNLOAD=y
20# CONFIG_LBDAF is not set 20# CONFIG_LBDAF is not set
21# CONFIG_BLK_DEV_BSG is not set 21# CONFIG_BLK_DEV_BSG is not set
22# CONFIG_IOSCHED_DEADLINE is not set 22# CONFIG_IOSCHED_DEADLINE is not set
23# CONFIG_IOSCHED_CFQ is not set
23CONFIG_PREEMPT_VOLUNTARY=y 24CONFIG_PREEMPT_VOLUNTARY=y
24CONFIG_BFIN533_EZKIT=y 25CONFIG_BFIN533_EZKIT=y
25CONFIG_TIMER0=11 26CONFIG_TIMER0=11
@@ -107,6 +108,5 @@ CONFIG_DEBUG_DOUBLEFAULT=y
107CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE=y 108CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE=y
108CONFIG_EARLY_PRINTK=y 109CONFIG_EARLY_PRINTK=y
109CONFIG_CPLB_INFO=y 110CONFIG_CPLB_INFO=y
110CONFIG_SECURITY=y
111CONFIG_CRYPTO=y 111CONFIG_CRYPTO=y
112# CONFIG_CRYPTO_ANSI_CPRNG is not set 112# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/blackfin/configs/BF533-STAMP_defconfig b/arch/blackfin/configs/BF533-STAMP_defconfig
index aa8c1d7453ba..0e7262c04cc2 100644
--- a/arch/blackfin/configs/BF533-STAMP_defconfig
+++ b/arch/blackfin/configs/BF533-STAMP_defconfig
@@ -20,6 +20,7 @@ CONFIG_MODULE_UNLOAD=y
20# CONFIG_LBDAF is not set 20# CONFIG_LBDAF is not set
21# CONFIG_BLK_DEV_BSG is not set 21# CONFIG_BLK_DEV_BSG is not set
22# CONFIG_IOSCHED_DEADLINE is not set 22# CONFIG_IOSCHED_DEADLINE is not set
23# CONFIG_IOSCHED_CFQ is not set
23CONFIG_PREEMPT_VOLUNTARY=y 24CONFIG_PREEMPT_VOLUNTARY=y
24CONFIG_TIMER0=11 25CONFIG_TIMER0=11
25CONFIG_HIGH_RES_TIMERS=y 26CONFIG_HIGH_RES_TIMERS=y
@@ -121,6 +122,5 @@ CONFIG_DEBUG_DOUBLEFAULT=y
121CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE=y 122CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE=y
122CONFIG_EARLY_PRINTK=y 123CONFIG_EARLY_PRINTK=y
123CONFIG_CPLB_INFO=y 124CONFIG_CPLB_INFO=y
124CONFIG_SECURITY=y
125CONFIG_CRYPTO=y 125CONFIG_CRYPTO=y
126# CONFIG_CRYPTO_ANSI_CPRNG is not set 126# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/blackfin/configs/BF537-STAMP_defconfig b/arch/blackfin/configs/BF537-STAMP_defconfig
index f245c0b427e4..4d14a002e7bd 100644
--- a/arch/blackfin/configs/BF537-STAMP_defconfig
+++ b/arch/blackfin/configs/BF537-STAMP_defconfig
@@ -20,9 +20,9 @@ CONFIG_MODULE_UNLOAD=y
20# CONFIG_LBDAF is not set 20# CONFIG_LBDAF is not set
21# CONFIG_BLK_DEV_BSG is not set 21# CONFIG_BLK_DEV_BSG is not set
22# CONFIG_IOSCHED_DEADLINE is not set 22# CONFIG_IOSCHED_DEADLINE is not set
23# CONFIG_IOSCHED_CFQ is not set
23CONFIG_PREEMPT_VOLUNTARY=y 24CONFIG_PREEMPT_VOLUNTARY=y
24CONFIG_BF537=y 25CONFIG_BF537=y
25CONFIG_IRQ_ERROR=11
26CONFIG_HIGH_RES_TIMERS=y 26CONFIG_HIGH_RES_TIMERS=y
27CONFIG_NOMMU_INITIAL_TRIM_EXCESS=0 27CONFIG_NOMMU_INITIAL_TRIM_EXCESS=0
28CONFIG_BFIN_GPTIMERS=m 28CONFIG_BFIN_GPTIMERS=m
@@ -133,6 +133,5 @@ CONFIG_DEBUG_DOUBLEFAULT=y
133CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE=y 133CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE=y
134CONFIG_EARLY_PRINTK=y 134CONFIG_EARLY_PRINTK=y
135CONFIG_CPLB_INFO=y 135CONFIG_CPLB_INFO=y
136CONFIG_SECURITY=y
137CONFIG_CRYPTO=y 136CONFIG_CRYPTO=y
138# CONFIG_CRYPTO_ANSI_CPRNG is not set 137# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/blackfin/configs/BF538-EZKIT_defconfig b/arch/blackfin/configs/BF538-EZKIT_defconfig
index 74a330cca9b4..fbee9d776f56 100644
--- a/arch/blackfin/configs/BF538-EZKIT_defconfig
+++ b/arch/blackfin/configs/BF538-EZKIT_defconfig
@@ -20,6 +20,7 @@ CONFIG_MODULE_UNLOAD=y
20# CONFIG_LBDAF is not set 20# CONFIG_LBDAF is not set
21# CONFIG_BLK_DEV_BSG is not set 21# CONFIG_BLK_DEV_BSG is not set
22# CONFIG_IOSCHED_DEADLINE is not set 22# CONFIG_IOSCHED_DEADLINE is not set
23# CONFIG_IOSCHED_CFQ is not set
23CONFIG_PREEMPT_VOLUNTARY=y 24CONFIG_PREEMPT_VOLUNTARY=y
24CONFIG_BF538=y 25CONFIG_BF538=y
25CONFIG_IRQ_TIMER0=12 26CONFIG_IRQ_TIMER0=12
@@ -31,6 +32,7 @@ CONFIG_C_CDPRIO=y
31CONFIG_BANK_3=0x99B2 32CONFIG_BANK_3=0x99B2
32CONFIG_BINFMT_FLAT=y 33CONFIG_BINFMT_FLAT=y
33CONFIG_BINFMT_ZFLAT=y 34CONFIG_BINFMT_ZFLAT=y
35CONFIG_PM=y
34CONFIG_NET=y 36CONFIG_NET=y
35CONFIG_PACKET=y 37CONFIG_PACKET=y
36CONFIG_UNIX=y 38CONFIG_UNIX=y
@@ -129,6 +131,5 @@ CONFIG_DEBUG_DOUBLEFAULT=y
129CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE=y 131CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE=y
130CONFIG_EARLY_PRINTK=y 132CONFIG_EARLY_PRINTK=y
131CONFIG_CPLB_INFO=y 133CONFIG_CPLB_INFO=y
132CONFIG_SECURITY=y
133CONFIG_CRYPTO=y 134CONFIG_CRYPTO=y
134# CONFIG_CRYPTO_ANSI_CPRNG is not set 135# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/blackfin/configs/BF548-EZKIT_defconfig b/arch/blackfin/configs/BF548-EZKIT_defconfig
index 29373cbba227..05dd11db2f7d 100644
--- a/arch/blackfin/configs/BF548-EZKIT_defconfig
+++ b/arch/blackfin/configs/BF548-EZKIT_defconfig
@@ -40,6 +40,7 @@ CONFIG_EBIU_MODEVAL=0x1
40CONFIG_EBIU_FCTLVAL=0x6 40CONFIG_EBIU_FCTLVAL=0x6
41CONFIG_BINFMT_FLAT=y 41CONFIG_BINFMT_FLAT=y
42CONFIG_BINFMT_ZFLAT=y 42CONFIG_BINFMT_ZFLAT=y
43CONFIG_PM=y
43CONFIG_NET=y 44CONFIG_NET=y
44CONFIG_PACKET=y 45CONFIG_PACKET=y
45CONFIG_UNIX=y 46CONFIG_UNIX=y
@@ -62,7 +63,7 @@ CONFIG_IRCOMM=m
62CONFIG_IRTTY_SIR=m 63CONFIG_IRTTY_SIR=m
63CONFIG_BFIN_SIR=m 64CONFIG_BFIN_SIR=m
64CONFIG_BFIN_SIR3=y 65CONFIG_BFIN_SIR3=y
65CONFIG_LIB80211=m 66# CONFIG_WIRELESS is not set
66CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 67CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
67CONFIG_FW_LOADER=m 68CONFIG_FW_LOADER=m
68CONFIG_MTD=y 69CONFIG_MTD=y
@@ -92,6 +93,7 @@ CONFIG_NET_ETHERNET=y
92CONFIG_SMSC911X=y 93CONFIG_SMSC911X=y
93# CONFIG_NETDEV_1000 is not set 94# CONFIG_NETDEV_1000 is not set
94# CONFIG_NETDEV_10000 is not set 95# CONFIG_NETDEV_10000 is not set
96# CONFIG_WLAN is not set
95CONFIG_INPUT_FF_MEMLESS=m 97CONFIG_INPUT_FF_MEMLESS=m
96# CONFIG_INPUT_MOUSEDEV is not set 98# CONFIG_INPUT_MOUSEDEV is not set
97CONFIG_INPUT_EVDEV=m 99CONFIG_INPUT_EVDEV=m
diff --git a/arch/blackfin/configs/BF561-ACVILON_defconfig b/arch/blackfin/configs/BF561-ACVILON_defconfig
index 1f12034f5610..bcb14d1c5664 100644
--- a/arch/blackfin/configs/BF561-ACVILON_defconfig
+++ b/arch/blackfin/configs/BF561-ACVILON_defconfig
@@ -14,6 +14,7 @@ CONFIG_EMBEDDED=y
14# CONFIG_EVENTFD is not set 14# CONFIG_EVENTFD is not set
15# CONFIG_AIO is not set 15# CONFIG_AIO is not set
16CONFIG_SLAB=y 16CONFIG_SLAB=y
17CONFIG_MMAP_ALLOW_UNINITIALIZED=y
17CONFIG_MODULES=y 18CONFIG_MODULES=y
18CONFIG_MODULE_UNLOAD=y 19CONFIG_MODULE_UNLOAD=y
19# CONFIG_LBDAF is not set 20# CONFIG_LBDAF is not set
@@ -44,6 +45,7 @@ CONFIG_IP_PNP=y
44CONFIG_SYN_COOKIES=y 45CONFIG_SYN_COOKIES=y
45# CONFIG_INET_LRO is not set 46# CONFIG_INET_LRO is not set
46# CONFIG_IPV6 is not set 47# CONFIG_IPV6 is not set
48# CONFIG_WIRELESS is not set
47CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 49CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
48# CONFIG_FW_LOADER is not set 50# CONFIG_FW_LOADER is not set
49CONFIG_MTD=y 51CONFIG_MTD=y
@@ -71,6 +73,7 @@ CONFIG_NET_ETHERNET=y
71CONFIG_SMSC911X=y 73CONFIG_SMSC911X=y
72# CONFIG_NETDEV_1000 is not set 74# CONFIG_NETDEV_1000 is not set
73# CONFIG_NETDEV_10000 is not set 75# CONFIG_NETDEV_10000 is not set
76# CONFIG_WLAN is not set
74# CONFIG_INPUT is not set 77# CONFIG_INPUT is not set
75# CONFIG_SERIO is not set 78# CONFIG_SERIO is not set
76# CONFIG_VT is not set 79# CONFIG_VT is not set
@@ -147,5 +150,4 @@ CONFIG_DEBUG_INFO=y
147CONFIG_DEBUG_MMRS=y 150CONFIG_DEBUG_MMRS=y
148# CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set 151# CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set
149CONFIG_CPLB_INFO=y 152CONFIG_CPLB_INFO=y
150CONFIG_SECURITY=y
151# CONFIG_CRYPTO_ANSI_CPRNG is not set 153# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/blackfin/configs/BF561-EZKIT_defconfig b/arch/blackfin/configs/BF561-EZKIT_defconfig
index 8913d997fa47..843aaa54a9e3 100644
--- a/arch/blackfin/configs/BF561-EZKIT_defconfig
+++ b/arch/blackfin/configs/BF561-EZKIT_defconfig
@@ -35,6 +35,7 @@ CONFIG_C_CDPRIO=y
35CONFIG_BANK_3=0xAAC2 35CONFIG_BANK_3=0xAAC2
36CONFIG_BINFMT_FLAT=y 36CONFIG_BINFMT_FLAT=y
37CONFIG_BINFMT_ZFLAT=y 37CONFIG_BINFMT_ZFLAT=y
38CONFIG_PM=y
38CONFIG_NET=y 39CONFIG_NET=y
39CONFIG_PACKET=y 40CONFIG_PACKET=y
40CONFIG_UNIX=y 41CONFIG_UNIX=y
diff --git a/arch/blackfin/configs/BlackStamp_defconfig b/arch/blackfin/configs/BlackStamp_defconfig
index 0242917b69c9..dae7adf3b2a2 100644
--- a/arch/blackfin/configs/BlackStamp_defconfig
+++ b/arch/blackfin/configs/BlackStamp_defconfig
@@ -40,6 +40,7 @@ CONFIG_INET=y
40CONFIG_IP_PNP=y 40CONFIG_IP_PNP=y
41# CONFIG_INET_LRO is not set 41# CONFIG_INET_LRO is not set
42# CONFIG_IPV6 is not set 42# CONFIG_IPV6 is not set
43# CONFIG_WIRELESS is not set
43CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 44CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
44# CONFIG_FW_LOADER is not set 45# CONFIG_FW_LOADER is not set
45CONFIG_MTD=y 46CONFIG_MTD=y
@@ -63,6 +64,7 @@ CONFIG_NET_ETHERNET=y
63CONFIG_SMC91X=y 64CONFIG_SMC91X=y
64# CONFIG_NETDEV_1000 is not set 65# CONFIG_NETDEV_1000 is not set
65# CONFIG_NETDEV_10000 is not set 66# CONFIG_NETDEV_10000 is not set
67# CONFIG_WLAN is not set
66# CONFIG_INPUT_MOUSEDEV is not set 68# CONFIG_INPUT_MOUSEDEV is not set
67CONFIG_INPUT_EVDEV=m 69CONFIG_INPUT_EVDEV=m
68# CONFIG_INPUT_KEYBOARD is not set 70# CONFIG_INPUT_KEYBOARD is not set
@@ -104,5 +106,4 @@ CONFIG_DEBUG_MMRS=y
104# CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set 106# CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set
105CONFIG_EARLY_PRINTK=y 107CONFIG_EARLY_PRINTK=y
106CONFIG_CPLB_INFO=y 108CONFIG_CPLB_INFO=y
107CONFIG_SECURITY=y
108CONFIG_CRC_CCITT=m 109CONFIG_CRC_CCITT=m
diff --git a/arch/blackfin/configs/CM-BF527_defconfig b/arch/blackfin/configs/CM-BF527_defconfig
index 0512fef3d55a..f3414244bfed 100644
--- a/arch/blackfin/configs/CM-BF527_defconfig
+++ b/arch/blackfin/configs/CM-BF527_defconfig
@@ -50,6 +50,7 @@ CONFIG_IP_PNP=y
50# CONFIG_INET_LRO is not set 50# CONFIG_INET_LRO is not set
51# CONFIG_INET_DIAG is not set 51# CONFIG_INET_DIAG is not set
52# CONFIG_IPV6 is not set 52# CONFIG_IPV6 is not set
53# CONFIG_WIRELESS is not set
53CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 54CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
54# CONFIG_FW_LOADER is not set 55# CONFIG_FW_LOADER is not set
55CONFIG_MTD=y 56CONFIG_MTD=y
@@ -70,9 +71,9 @@ CONFIG_BLK_DEV_SD=y
70CONFIG_NETDEVICES=y 71CONFIG_NETDEVICES=y
71CONFIG_NET_ETHERNET=y 72CONFIG_NET_ETHERNET=y
72CONFIG_BFIN_MAC=y 73CONFIG_BFIN_MAC=y
73CONFIG_BFIN_MAC_RMII=y
74# CONFIG_NETDEV_1000 is not set 74# CONFIG_NETDEV_1000 is not set
75# CONFIG_NETDEV_10000 is not set 75# CONFIG_NETDEV_10000 is not set
76# CONFIG_WLAN is not set
76# CONFIG_INPUT is not set 77# CONFIG_INPUT is not set
77# CONFIG_SERIO is not set 78# CONFIG_SERIO is not set
78# CONFIG_VT is not set 79# CONFIG_VT is not set
@@ -124,7 +125,6 @@ CONFIG_DEBUG_FS=y
124# CONFIG_RCU_CPU_STALL_DETECTOR is not set 125# CONFIG_RCU_CPU_STALL_DETECTOR is not set
125# CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set 126# CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set
126CONFIG_EARLY_PRINTK=y 127CONFIG_EARLY_PRINTK=y
127CONFIG_SECURITY=y
128CONFIG_CRYPTO=y 128CONFIG_CRYPTO=y
129# CONFIG_CRYPTO_ANSI_CPRNG is not set 129# CONFIG_CRYPTO_ANSI_CPRNG is not set
130CONFIG_CRC_CCITT=m 130CONFIG_CRC_CCITT=m
diff --git a/arch/blackfin/configs/CM-BF533_defconfig b/arch/blackfin/configs/CM-BF533_defconfig
index 05e09be8b4c5..8c7e08f173d4 100644
--- a/arch/blackfin/configs/CM-BF533_defconfig
+++ b/arch/blackfin/configs/CM-BF533_defconfig
@@ -33,6 +33,7 @@ CONFIG_BINFMT_SHARED_FLAT=y
33CONFIG_NET=y 33CONFIG_NET=y
34CONFIG_PACKET=y 34CONFIG_PACKET=y
35CONFIG_UNIX=y 35CONFIG_UNIX=y
36# CONFIG_WIRELESS is not set
36CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 37CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
37CONFIG_MTD=y 38CONFIG_MTD=y
38CONFIG_MTD_PARTITIONS=y 39CONFIG_MTD_PARTITIONS=y
@@ -47,6 +48,7 @@ CONFIG_MTD_PHYSMAP=y
47CONFIG_NETDEVICES=y 48CONFIG_NETDEVICES=y
48# CONFIG_NETDEV_1000 is not set 49# CONFIG_NETDEV_1000 is not set
49# CONFIG_NETDEV_10000 is not set 50# CONFIG_NETDEV_10000 is not set
51# CONFIG_WLAN is not set
50# CONFIG_INPUT is not set 52# CONFIG_INPUT is not set
51# CONFIG_SERIO is not set 53# CONFIG_SERIO is not set
52# CONFIG_VT is not set 54# CONFIG_VT is not set
@@ -72,7 +74,6 @@ CONFIG_DEBUG_MMRS=y
72# CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set 74# CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set
73CONFIG_EARLY_PRINTK=y 75CONFIG_EARLY_PRINTK=y
74CONFIG_CPLB_INFO=y 76CONFIG_CPLB_INFO=y
75CONFIG_SECURITY=y
76CONFIG_CRC_CCITT=y 77CONFIG_CRC_CCITT=y
77CONFIG_CRC_ITU_T=y 78CONFIG_CRC_ITU_T=y
78CONFIG_CRC7=y 79CONFIG_CRC7=y
diff --git a/arch/blackfin/configs/CM-BF537E_defconfig b/arch/blackfin/configs/CM-BF537E_defconfig
index d2eb5325b9c3..bd3cb766d078 100644
--- a/arch/blackfin/configs/CM-BF537E_defconfig
+++ b/arch/blackfin/configs/CM-BF537E_defconfig
@@ -48,6 +48,7 @@ CONFIG_IP_PNP=y
48# CONFIG_INET_LRO is not set 48# CONFIG_INET_LRO is not set
49# CONFIG_INET_DIAG is not set 49# CONFIG_INET_DIAG is not set
50# CONFIG_IPV6 is not set 50# CONFIG_IPV6 is not set
51# CONFIG_WIRELESS is not set
51CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 52CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
52CONFIG_MTD=y 53CONFIG_MTD=y
53CONFIG_MTD_CMDLINE_PARTS=y 54CONFIG_MTD_CMDLINE_PARTS=y
@@ -65,6 +66,7 @@ CONFIG_NET_ETHERNET=y
65CONFIG_BFIN_MAC=y 66CONFIG_BFIN_MAC=y
66# CONFIG_NETDEV_1000 is not set 67# CONFIG_NETDEV_1000 is not set
67# CONFIG_NETDEV_10000 is not set 68# CONFIG_NETDEV_10000 is not set
69# CONFIG_WLAN is not set
68# CONFIG_INPUT is not set 70# CONFIG_INPUT is not set
69# CONFIG_SERIO is not set 71# CONFIG_SERIO is not set
70# CONFIG_VT is not set 72# CONFIG_VT is not set
@@ -99,7 +101,6 @@ CONFIG_DEBUG_MMRS=y
99# CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set 101# CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set
100CONFIG_EARLY_PRINTK=y 102CONFIG_EARLY_PRINTK=y
101CONFIG_CPLB_INFO=y 103CONFIG_CPLB_INFO=y
102CONFIG_SECURITY=y
103CONFIG_CRYPTO=y 104CONFIG_CRYPTO=y
104# CONFIG_CRYPTO_ANSI_CPRNG is not set 105# CONFIG_CRYPTO_ANSI_CPRNG is not set
105CONFIG_CRC_CCITT=m 106CONFIG_CRC_CCITT=m
diff --git a/arch/blackfin/configs/CM-BF537U_defconfig b/arch/blackfin/configs/CM-BF537U_defconfig
index 9d52c443eb09..82224f37c04e 100644
--- a/arch/blackfin/configs/CM-BF537U_defconfig
+++ b/arch/blackfin/configs/CM-BF537U_defconfig
@@ -44,6 +44,7 @@ CONFIG_INET=y
44# CONFIG_INET_XFRM_MODE_BEET is not set 44# CONFIG_INET_XFRM_MODE_BEET is not set
45# CONFIG_INET_DIAG is not set 45# CONFIG_INET_DIAG is not set
46# CONFIG_IPV6 is not set 46# CONFIG_IPV6 is not set
47# CONFIG_WIRELESS is not set
47CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 48CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
48CONFIG_MTD=y 49CONFIG_MTD=y
49CONFIG_MTD_CMDLINE_PARTS=y 50CONFIG_MTD_CMDLINE_PARTS=y
@@ -59,6 +60,7 @@ CONFIG_BLK_DEV_RAM=y
59CONFIG_NETDEVICES=y 60CONFIG_NETDEVICES=y
60# CONFIG_NETDEV_1000 is not set 61# CONFIG_NETDEV_1000 is not set
61# CONFIG_NETDEV_10000 is not set 62# CONFIG_NETDEV_10000 is not set
63# CONFIG_WLAN is not set
62# CONFIG_INPUT is not set 64# CONFIG_INPUT is not set
63# CONFIG_SERIO is not set 65# CONFIG_SERIO is not set
64# CONFIG_VT is not set 66# CONFIG_VT is not set
@@ -90,7 +92,6 @@ CONFIG_DEBUG_MMRS=y
90# CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set 92# CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set
91CONFIG_EARLY_PRINTK=y 93CONFIG_EARLY_PRINTK=y
92CONFIG_CPLB_INFO=y 94CONFIG_CPLB_INFO=y
93CONFIG_SECURITY=y
94CONFIG_CRC_CCITT=m 95CONFIG_CRC_CCITT=m
95CONFIG_CRC_ITU_T=y 96CONFIG_CRC_ITU_T=y
96CONFIG_CRC7=y 97CONFIG_CRC7=y
diff --git a/arch/blackfin/configs/CM-BF548_defconfig b/arch/blackfin/configs/CM-BF548_defconfig
index 9de13cf2cdda..433598c6e773 100644
--- a/arch/blackfin/configs/CM-BF548_defconfig
+++ b/arch/blackfin/configs/CM-BF548_defconfig
@@ -49,6 +49,7 @@ CONFIG_INET_XFRM_MODE_BEET=m
49# CONFIG_INET_LRO is not set 49# CONFIG_INET_LRO is not set
50# CONFIG_INET_DIAG is not set 50# CONFIG_INET_DIAG is not set
51# CONFIG_IPV6 is not set 51# CONFIG_IPV6 is not set
52# CONFIG_WIRELESS is not set
52CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 53CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
53# CONFIG_FW_LOADER is not set 54# CONFIG_FW_LOADER is not set
54CONFIG_MTD=y 55CONFIG_MTD=y
@@ -71,6 +72,7 @@ CONFIG_NET_ETHERNET=y
71CONFIG_SMSC911X=y 72CONFIG_SMSC911X=y
72# CONFIG_NETDEV_1000 is not set 73# CONFIG_NETDEV_1000 is not set
73# CONFIG_NETDEV_10000 is not set 74# CONFIG_NETDEV_10000 is not set
75# CONFIG_WLAN is not set
74# CONFIG_INPUT_MOUSEDEV is not set 76# CONFIG_INPUT_MOUSEDEV is not set
75CONFIG_INPUT_EVDEV=m 77CONFIG_INPUT_EVDEV=m
76CONFIG_INPUT_EVBUG=m 78CONFIG_INPUT_EVBUG=m
@@ -167,7 +169,6 @@ CONFIG_DEBUG_FS=y
167# CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set 169# CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set
168CONFIG_EARLY_PRINTK=y 170CONFIG_EARLY_PRINTK=y
169CONFIG_CPLB_INFO=y 171CONFIG_CPLB_INFO=y
170CONFIG_SECURITY=y
171# CONFIG_CRYPTO_ANSI_CPRNG is not set 172# CONFIG_CRYPTO_ANSI_CPRNG is not set
172# CONFIG_CRYPTO_HW is not set 173# CONFIG_CRYPTO_HW is not set
173CONFIG_CRC_CCITT=m 174CONFIG_CRC_CCITT=m
diff --git a/arch/blackfin/configs/CM-BF561_defconfig b/arch/blackfin/configs/CM-BF561_defconfig
index 238353a53bf0..ded7d845cb39 100644
--- a/arch/blackfin/configs/CM-BF561_defconfig
+++ b/arch/blackfin/configs/CM-BF561_defconfig
@@ -48,6 +48,7 @@ CONFIG_INET=y
48# CONFIG_INET_LRO is not set 48# CONFIG_INET_LRO is not set
49# CONFIG_INET_DIAG is not set 49# CONFIG_INET_DIAG is not set
50# CONFIG_IPV6 is not set 50# CONFIG_IPV6 is not set
51# CONFIG_WIRELESS is not set
51CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 52CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
52CONFIG_MTD=y 53CONFIG_MTD=y
53CONFIG_MTD_PARTITIONS=y 54CONFIG_MTD_PARTITIONS=y
@@ -67,6 +68,7 @@ CONFIG_MII=y
67CONFIG_SMSC911X=m 68CONFIG_SMSC911X=m
68# CONFIG_NETDEV_1000 is not set 69# CONFIG_NETDEV_1000 is not set
69# CONFIG_NETDEV_10000 is not set 70# CONFIG_NETDEV_10000 is not set
71# CONFIG_WLAN is not set
70# CONFIG_INPUT is not set 72# CONFIG_INPUT is not set
71# CONFIG_SERIO is not set 73# CONFIG_SERIO is not set
72# CONFIG_VT is not set 74# CONFIG_VT is not set
@@ -99,7 +101,6 @@ CONFIG_DEBUG_MMRS=y
99# CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set 101# CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set
100CONFIG_EARLY_PRINTK=y 102CONFIG_EARLY_PRINTK=y
101CONFIG_CPLB_INFO=y 103CONFIG_CPLB_INFO=y
102CONFIG_SECURITY=y
103CONFIG_CRC_CCITT=m 104CONFIG_CRC_CCITT=m
104CONFIG_CRC_ITU_T=y 105CONFIG_CRC_ITU_T=y
105CONFIG_CRC7=y 106CONFIG_CRC7=y
diff --git a/arch/blackfin/configs/H8606_defconfig b/arch/blackfin/configs/H8606_defconfig
index 0cb524e8947f..700fb701c121 100644
--- a/arch/blackfin/configs/H8606_defconfig
+++ b/arch/blackfin/configs/H8606_defconfig
@@ -33,6 +33,7 @@ CONFIG_IRLAN=m
33CONFIG_IRCOMM=m 33CONFIG_IRCOMM=m
34CONFIG_IRDA_CACHE_LAST_LSAP=y 34CONFIG_IRDA_CACHE_LAST_LSAP=y
35CONFIG_IRTTY_SIR=m 35CONFIG_IRTTY_SIR=m
36# CONFIG_WIRELESS is not set
36# CONFIG_FW_LOADER is not set 37# CONFIG_FW_LOADER is not set
37CONFIG_MTD=y 38CONFIG_MTD=y
38CONFIG_MTD_PARTITIONS=y 39CONFIG_MTD_PARTITIONS=y
@@ -50,6 +51,7 @@ CONFIG_NET_ETHERNET=y
50CONFIG_DM9000=y 51CONFIG_DM9000=y
51# CONFIG_NETDEV_1000 is not set 52# CONFIG_NETDEV_1000 is not set
52# CONFIG_NETDEV_10000 is not set 53# CONFIG_NETDEV_10000 is not set
54# CONFIG_WLAN is not set
53# CONFIG_INPUT_MOUSEDEV is not set 55# CONFIG_INPUT_MOUSEDEV is not set
54CONFIG_INPUT_EVDEV=y 56CONFIG_INPUT_EVDEV=y
55# CONFIG_KEYBOARD_ATKBD is not set 57# CONFIG_KEYBOARD_ATKBD is not set
@@ -84,4 +86,3 @@ CONFIG_NFS_V3=y
84CONFIG_NLS=m 86CONFIG_NLS=m
85# CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set 87# CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set
86CONFIG_CPLB_INFO=y 88CONFIG_CPLB_INFO=y
87CONFIG_SECURITY=y
diff --git a/arch/blackfin/configs/IP0X_defconfig b/arch/blackfin/configs/IP0X_defconfig
index 2a3411ef19fd..b40156d217e3 100644
--- a/arch/blackfin/configs/IP0X_defconfig
+++ b/arch/blackfin/configs/IP0X_defconfig
@@ -41,6 +41,7 @@ CONFIG_IP_NF_IPTABLES=y
41CONFIG_IP_NF_FILTER=y 41CONFIG_IP_NF_FILTER=y
42CONFIG_IP_NF_TARGET_REJECT=y 42CONFIG_IP_NF_TARGET_REJECT=y
43CONFIG_IP_NF_MANGLE=y 43CONFIG_IP_NF_MANGLE=y
44# CONFIG_WIRELESS is not set
44CONFIG_MTD=y 45CONFIG_MTD=y
45CONFIG_MTD_PARTITIONS=y 46CONFIG_MTD_PARTITIONS=y
46CONFIG_MTD_CHAR=y 47CONFIG_MTD_CHAR=y
@@ -60,6 +61,7 @@ CONFIG_NET_ETHERNET=y
60CONFIG_DM9000=y 61CONFIG_DM9000=y
61# CONFIG_NETDEV_1000 is not set 62# CONFIG_NETDEV_1000 is not set
62# CONFIG_NETDEV_10000 is not set 63# CONFIG_NETDEV_10000 is not set
64# CONFIG_WLAN is not set
63# CONFIG_INPUT is not set 65# CONFIG_INPUT is not set
64# CONFIG_SERIO is not set 66# CONFIG_SERIO is not set
65# CONFIG_VT is not set 67# CONFIG_VT is not set
@@ -89,5 +91,4 @@ CONFIG_NLS_CODEPAGE_437=y
89CONFIG_NLS_ISO8859_1=y 91CONFIG_NLS_ISO8859_1=y
90# CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set 92# CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set
91CONFIG_CPLB_INFO=y 93CONFIG_CPLB_INFO=y
92CONFIG_SECURITY=y
93CONFIG_CRC_CCITT=y 94CONFIG_CRC_CCITT=y
diff --git a/arch/blackfin/configs/PNAV-10_defconfig b/arch/blackfin/configs/PNAV-10_defconfig
index fea303386548..be866d95ed76 100644
--- a/arch/blackfin/configs/PNAV-10_defconfig
+++ b/arch/blackfin/configs/PNAV-10_defconfig
@@ -14,6 +14,7 @@ CONFIG_MODULE_UNLOAD=y
14# CONFIG_LBDAF is not set 14# CONFIG_LBDAF is not set
15# CONFIG_BLK_DEV_BSG is not set 15# CONFIG_BLK_DEV_BSG is not set
16# CONFIG_IOSCHED_DEADLINE is not set 16# CONFIG_IOSCHED_DEADLINE is not set
17# CONFIG_IOSCHED_CFQ is not set
17CONFIG_PREEMPT_VOLUNTARY=y 18CONFIG_PREEMPT_VOLUNTARY=y
18CONFIG_BF537=y 19CONFIG_BF537=y
19CONFIG_IRQ_TIMER0=12 20CONFIG_IRQ_TIMER0=12
@@ -107,7 +108,6 @@ CONFIG_SMB_FS=m
107# CONFIG_DEBUG_HUNT_FOR_ZERO is not set 108# CONFIG_DEBUG_HUNT_FOR_ZERO is not set
108# CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set 109# CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set
109# CONFIG_ACCESS_CHECK is not set 110# CONFIG_ACCESS_CHECK is not set
110CONFIG_SECURITY=y
111CONFIG_CRYPTO=y 111CONFIG_CRYPTO=y
112# CONFIG_CRYPTO_ANSI_CPRNG is not set 112# CONFIG_CRYPTO_ANSI_CPRNG is not set
113CONFIG_CRC_CCITT=m 113CONFIG_CRC_CCITT=m
diff --git a/arch/blackfin/configs/SRV1_defconfig b/arch/blackfin/configs/SRV1_defconfig
index 9811b3186847..b64bdf759b82 100644
--- a/arch/blackfin/configs/SRV1_defconfig
+++ b/arch/blackfin/configs/SRV1_defconfig
@@ -35,6 +35,7 @@ CONFIG_IRLAN=m
35CONFIG_IRCOMM=m 35CONFIG_IRCOMM=m
36CONFIG_IRDA_CACHE_LAST_LSAP=y 36CONFIG_IRDA_CACHE_LAST_LSAP=y
37CONFIG_IRTTY_SIR=m 37CONFIG_IRTTY_SIR=m
38# CONFIG_WIRELESS is not set
38# CONFIG_FW_LOADER is not set 39# CONFIG_FW_LOADER is not set
39CONFIG_MTD=y 40CONFIG_MTD=y
40CONFIG_MTD_PARTITIONS=y 41CONFIG_MTD_PARTITIONS=y
@@ -51,6 +52,7 @@ CONFIG_EEPROM_AT25=m
51CONFIG_NETDEVICES=y 52CONFIG_NETDEVICES=y
52# CONFIG_NETDEV_1000 is not set 53# CONFIG_NETDEV_1000 is not set
53# CONFIG_NETDEV_10000 is not set 54# CONFIG_NETDEV_10000 is not set
55# CONFIG_WLAN is not set
54# CONFIG_INPUT_MOUSEDEV is not set 56# CONFIG_INPUT_MOUSEDEV is not set
55CONFIG_INPUT_EVDEV=m 57CONFIG_INPUT_EVDEV=m
56# CONFIG_INPUT_KEYBOARD is not set 58# CONFIG_INPUT_KEYBOARD is not set
@@ -85,4 +87,3 @@ CONFIG_DEBUG_KERNEL=y
85CONFIG_DEBUG_INFO=y 87CONFIG_DEBUG_INFO=y
86# CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set 88# CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set
87CONFIG_CPLB_INFO=y 89CONFIG_CPLB_INFO=y
88CONFIG_SECURITY=y
diff --git a/arch/blackfin/configs/TCM-BF518_defconfig b/arch/blackfin/configs/TCM-BF518_defconfig
index 412bf79b9724..1bccd9a50986 100644
--- a/arch/blackfin/configs/TCM-BF518_defconfig
+++ b/arch/blackfin/configs/TCM-BF518_defconfig
@@ -128,7 +128,6 @@ CONFIG_DEBUG_DOUBLEFAULT=y
128CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE=y 128CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE=y
129CONFIG_EARLY_PRINTK=y 129CONFIG_EARLY_PRINTK=y
130CONFIG_CPLB_INFO=y 130CONFIG_CPLB_INFO=y
131CONFIG_SECURITY=y
132CONFIG_CRYPTO=y 131CONFIG_CRYPTO=y
133# CONFIG_CRYPTO_ANSI_CPRNG is not set 132# CONFIG_CRYPTO_ANSI_CPRNG is not set
134CONFIG_CRC_CCITT=m 133CONFIG_CRC_CCITT=m
diff --git a/arch/blackfin/configs/TCM-BF537_defconfig b/arch/blackfin/configs/TCM-BF537_defconfig
index 04bf52c4cf12..00ce899e9e5d 100644
--- a/arch/blackfin/configs/TCM-BF537_defconfig
+++ b/arch/blackfin/configs/TCM-BF537_defconfig
@@ -40,6 +40,7 @@ CONFIG_UNIX=y
40CONFIG_INET=y 40CONFIG_INET=y
41# CONFIG_INET_DIAG is not set 41# CONFIG_INET_DIAG is not set
42# CONFIG_IPV6 is not set 42# CONFIG_IPV6 is not set
43# CONFIG_WIRELESS is not set
43CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 44CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
44CONFIG_MTD=y 45CONFIG_MTD=y
45CONFIG_MTD_CMDLINE_PARTS=y 46CONFIG_MTD_CMDLINE_PARTS=y
@@ -57,6 +58,7 @@ CONFIG_NET_ETHERNET=y
57CONFIG_BFIN_MAC=y 58CONFIG_BFIN_MAC=y
58# CONFIG_NETDEV_1000 is not set 59# CONFIG_NETDEV_1000 is not set
59# CONFIG_NETDEV_10000 is not set 60# CONFIG_NETDEV_10000 is not set
61# CONFIG_WLAN is not set
60# CONFIG_INPUT is not set 62# CONFIG_INPUT is not set
61# CONFIG_SERIO is not set 63# CONFIG_SERIO is not set
62# CONFIG_VT is not set 64# CONFIG_VT is not set