diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2013-04-15 10:55:23 -0400 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2013-04-15 10:55:23 -0400 |
| commit | b757f17e9184b65428c48a281d82f9acb3e96f0e (patch) | |
| tree | 7dc22c9f82f78c20caeff00fdd68a2e92e40504a /arch/blackfin | |
| parent | 3c76a8a95daeecd881718f88324041f6a5faab86 (diff) | |
| parent | da497f6fbaa190d34907ecc9dd85cfc62ba9f5a2 (diff) | |
Merge tag 'tags/soc_for_v3.10' into mvebu/dt
Pulling in mvebu branches which contain changes to armada*.dts? files for LPAE
conversion.
mvebu soc changes for v3.10
- use the mvebu-mbus driver
- prep for LPAE support
Depends:
- mvebu/cleanup (tags/cleanup_for_v3.10)
- mvebu/drivers (tags/drivers_for_v3.10)
Diffstat (limited to 'arch/blackfin')
| -rw-r--r-- | arch/blackfin/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index 600494c70e96..c3f2e0bc644a 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig | |||
| @@ -33,7 +33,7 @@ config BLACKFIN | |||
| 33 | select ARCH_HAVE_CUSTOM_GPIO_H | 33 | select ARCH_HAVE_CUSTOM_GPIO_H |
| 34 | select ARCH_WANT_OPTIONAL_GPIOLIB | 34 | select ARCH_WANT_OPTIONAL_GPIOLIB |
| 35 | select HAVE_UID16 | 35 | select HAVE_UID16 |
| 36 | select HAVE_VIRT_TO_BUS | 36 | select VIRT_TO_BUS |
| 37 | select ARCH_WANT_IPC_PARSE_VERSION | 37 | select ARCH_WANT_IPC_PARSE_VERSION |
| 38 | select HAVE_GENERIC_HARDIRQS | 38 | select HAVE_GENERIC_HARDIRQS |
| 39 | select GENERIC_ATOMIC64 | 39 | select GENERIC_ATOMIC64 |