diff options
| author | Olof Johansson <olof@lixom.net> | 2014-09-24 20:20:48 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-09-24 20:21:01 +0200 |
| commit | 28fd837204236cf5b5533525e5b53c5176fa97a3 (patch) | |
| tree | ac7dcad925950bc0bb53c5a55cb199e31e7aaee0 /arch/arm/Kconfig | |
| parent | Merge tag 'mvebu-soc-3.18' of git://git.infradead.org/linux-mvebu into next/c... (diff) | |
| parent | ARM: imx: Remove mach-mxt_td60 board file (diff) | |
| download | linux-28fd837204236cf5b5533525e5b53c5176fa97a3.tar.xz linux-28fd837204236cf5b5533525e5b53c5176fa97a3.zip | |
Merge tag 'imx-cleanup-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/cleanup
Merge "ARM: imx: cleanup for 3.18" from Shawn Guo:
The i.MX cleanup for 3.18:
- Reomve a few i.MX27 and i.MX1 board files
- Remove imx_scu_standby_enable() since core code handles scu
standby now
- Remove unnecessary iomux declaration
- Remove useless sound card property from vf610-twr dts
* tag 'imx-cleanup-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: imx: Remove mach-mxt_td60 board file
ARM: i.MX: Remove i.MX1 ADS board support
ARM: dts: vf610-twr: remove useless property for sound card.
ARM: imx: remove imx_scu_standby_enable()
ARM: i.MX: Remove Phytec i.MX27 PCM038/PCM970 board files
ARM: i.MX: Remove mach-cpuimx27sd board file
ARM: imx: iomux: Do not export symbol without public declaration
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index bd8beaebf0ec..314bdf1163f9 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1985,8 +1985,6 @@ config XIP_PHYS_ADDR config KEXEC bool "Kexec system call (EXPERIMENTAL)" depends on (!SMP || PM_SLEEP_SMP) - select CRYPTO - select CRYPTO_SHA256 help kexec is a system call that implements the ability to shutdown your current kernel, and to start another kernel. It is like a reboot |