diff options
| author | Chris Zankel <chris@zankel.net> | 2014-10-23 10:30:33 -0700 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2014-10-23 10:30:33 -0700 |
| commit | 66acb0216d5ae1f29fe76c5a192547664c5c0159 (patch) | |
| tree | 1db5fa8379e4b8578295e36f07a4885ef23e6e43 /arch/xtensa/Kconfig | |
| parent | a13926db3e5ea5bbac297f59e9f35061f52892d3 (diff) | |
| parent | 3ce2ce1c0d79477c8e093e675f38451105798def (diff) | |
| download | lwn-66acb0216d5ae1f29fe76c5a192547664c5c0159.tar.gz lwn-66acb0216d5ae1f29fe76c5a192547664c5c0159.zip | |
Merge tag 'xtensa-for-next-20141021-1' of git://github.com/jcmvbkbc/linux-xtensa into for_next
Xtensa improvements for 3.18:
- add seccomp, getrandom, and memfd_create syscalls;
- add defconfigs for KC705 and SMP LX200;
- fix ISS and xtfpga Kconfig dependencies so that more randconfigs
are buildable;
- fix umount syscall;
- implement pgprot_noncached.
Diffstat (limited to 'arch/xtensa/Kconfig')
| -rw-r--r-- | arch/xtensa/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig index 49c6c3d94449..81f57e8c8f1b 100644 --- a/arch/xtensa/Kconfig +++ b/arch/xtensa/Kconfig @@ -319,8 +319,8 @@ config XTENSA_PLATFORM_S6105 config XTENSA_PLATFORM_XTFPGA bool "XTFPGA" + select ETHOC if ETHERNET select SERIAL_CONSOLE - select ETHOC select XTENSA_CALIBRATE_CCOUNT help XTFPGA is the name of Tensilica board family (LX60, LX110, LX200, ML605). @@ -367,7 +367,7 @@ config BUILTIN_DTB config BLK_DEV_SIMDISK tristate "Host file-based simulated block device support" default n - depends on XTENSA_PLATFORM_ISS + depends on XTENSA_PLATFORM_ISS && BLOCK help Create block devices that map to files in the host file system. Device binding to host file may be changed at runtime via proc |