diff options
| author | Joerg Roedel <jroedel@suse.de> | 2015-01-26 07:22:25 -0500 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2015-01-26 07:22:25 -0500 |
| commit | 16753322983bcca0eca6d81f20d23277df0d6cf7 (patch) | |
| tree | 8064489ae62d2fc8ea344b6736f0b204e3187a3b /arch/arm64 | |
| parent | 26bc420b59a38e4e6685a73345a0def461136dce (diff) | |
| parent | 859a732e4f713270152c78df6e09accbde006734 (diff) | |
Merge branch 'for-joerg/arm-smmu/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into arm/smmu
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index b1f9a20a3677..528c3fd2d4c1 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig | |||
| @@ -349,7 +349,6 @@ config ARM64_VA_BITS_42 | |||
| 349 | 349 | ||
| 350 | config ARM64_VA_BITS_48 | 350 | config ARM64_VA_BITS_48 |
| 351 | bool "48-bit" | 351 | bool "48-bit" |
| 352 | depends on !ARM_SMMU | ||
| 353 | 352 | ||
| 354 | endchoice | 353 | endchoice |
| 355 | 354 | ||