diff options
-rw-r--r-- | arch/xtensa/Kconfig | 3 | ||||
-rw-r--r-- | arch/xtensa/configs/iss_defconfig | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig index 3b486dd5d6d4..eaa9d07907d7 100644 --- a/arch/xtensa/Kconfig +++ b/arch/xtensa/Kconfig | |||
@@ -15,7 +15,6 @@ config XTENSA | |||
15 | select GENERIC_PCI_IOMAP | 15 | select GENERIC_PCI_IOMAP |
16 | select GENERIC_SCHED_CLOCK | 16 | select GENERIC_SCHED_CLOCK |
17 | select HAVE_FUNCTION_TRACER | 17 | select HAVE_FUNCTION_TRACER |
18 | select HAVE_IDE | ||
19 | select HAVE_IRQ_TIME_ACCOUNTING | 18 | select HAVE_IRQ_TIME_ACCOUNTING |
20 | select HAVE_OPROFILE | 19 | select HAVE_OPROFILE |
21 | select HAVE_PERF_EVENTS | 20 | select HAVE_PERF_EVENTS |
@@ -286,12 +285,14 @@ config XTENSA_PLATFORM_ISS | |||
286 | 285 | ||
287 | config XTENSA_PLATFORM_XT2000 | 286 | config XTENSA_PLATFORM_XT2000 |
288 | bool "XT2000" | 287 | bool "XT2000" |
288 | select HAVE_IDE | ||
289 | help | 289 | help |
290 | XT2000 is the name of Tensilica's feature-rich emulation platform. | 290 | XT2000 is the name of Tensilica's feature-rich emulation platform. |
291 | This hardware is capable of running a full Linux distribution. | 291 | This hardware is capable of running a full Linux distribution. |
292 | 292 | ||
293 | config XTENSA_PLATFORM_S6105 | 293 | config XTENSA_PLATFORM_S6105 |
294 | bool "S6105" | 294 | bool "S6105" |
295 | select HAVE_IDE | ||
295 | select SERIAL_CONSOLE | 296 | select SERIAL_CONSOLE |
296 | select NO_IOPORT_MAP | 297 | select NO_IOPORT_MAP |
297 | 298 | ||
diff --git a/arch/xtensa/configs/iss_defconfig b/arch/xtensa/configs/iss_defconfig index 1493c68352d1..009fe4a266dc 100644 --- a/arch/xtensa/configs/iss_defconfig +++ b/arch/xtensa/configs/iss_defconfig | |||
@@ -308,7 +308,7 @@ CONFIG_MISC_DEVICES=y | |||
308 | # EEPROM support | 308 | # EEPROM support |
309 | # | 309 | # |
310 | # CONFIG_EEPROM_93CX6 is not set | 310 | # CONFIG_EEPROM_93CX6 is not set |
311 | CONFIG_HAVE_IDE=y | 311 | # CONFIG_HAVE_IDE is not set |
312 | # CONFIG_IDE is not set | 312 | # CONFIG_IDE is not set |
313 | 313 | ||
314 | # | 314 | # |