diff options
Diffstat (limited to 'arch/cris/Kconfig')
-rw-r--r-- | arch/cris/Kconfig | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig index 21900a9378bb..222da1501f47 100644 --- a/arch/cris/Kconfig +++ b/arch/cris/Kconfig | |||
@@ -13,6 +13,10 @@ config ZONE_DMA | |||
13 | bool | 13 | bool |
14 | default y | 14 | default y |
15 | 15 | ||
16 | config NO_DMA | ||
17 | bool | ||
18 | default y | ||
19 | |||
16 | config RWSEM_GENERIC_SPINLOCK | 20 | config RWSEM_GENERIC_SPINLOCK |
17 | bool | 21 | bool |
18 | default y | 22 | default y |
@@ -57,6 +61,10 @@ menu "General setup" | |||
57 | 61 | ||
58 | source "fs/Kconfig.binfmt" | 62 | source "fs/Kconfig.binfmt" |
59 | 63 | ||
64 | config GENERIC_HARDIRQS | ||
65 | bool | ||
66 | default y | ||
67 | |||
60 | config ETRAX_CMDLINE | 68 | config ETRAX_CMDLINE |
61 | string "Kernel command line" | 69 | string "Kernel command line" |
62 | default "root=/dev/mtdblock3" | 70 | default "root=/dev/mtdblock3" |
@@ -149,7 +157,8 @@ source "net/Kconfig" | |||
149 | 157 | ||
150 | # bring in ETRAX built-in drivers | 158 | # bring in ETRAX built-in drivers |
151 | menu "Drivers for built-in interfaces" | 159 | menu "Drivers for built-in interfaces" |
152 | source arch/cris/arch-v10/drivers/Kconfig | 160 | # arch/cris/arch is a symlink to correct arch (arch-v10 or arch-v32) |
161 | source arch/cris/arch/drivers/Kconfig | ||
153 | 162 | ||
154 | endmenu | 163 | endmenu |
155 | 164 | ||
@@ -180,6 +189,10 @@ source "drivers/isdn/Kconfig" | |||
180 | 189 | ||
181 | source "drivers/telephony/Kconfig" | 190 | source "drivers/telephony/Kconfig" |
182 | 191 | ||
192 | source "drivers/i2c/Kconfig" | ||
193 | |||
194 | source "drivers/rtc/Kconfig" | ||
195 | |||
183 | # | 196 | # |
184 | # input before char - char/joystick depends on it. As does USB. | 197 | # input before char - char/joystick depends on it. As does USB. |
185 | # | 198 | # |
@@ -194,6 +207,10 @@ source "fs/Kconfig" | |||
194 | 207 | ||
195 | source "sound/Kconfig" | 208 | source "sound/Kconfig" |
196 | 209 | ||
210 | source "drivers/pcmcia/Kconfig" | ||
211 | |||
212 | source "drivers/pci/Kconfig" | ||
213 | |||
197 | source "drivers/usb/Kconfig" | 214 | source "drivers/usb/Kconfig" |
198 | 215 | ||
199 | source "kernel/Kconfig.instrumentation" | 216 | source "kernel/Kconfig.instrumentation" |