diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-28 01:43:41 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-30 23:20:26 +0100 |
| commit | 2098990e7c558c175b96213d41058983e00a7919 (patch) | |
| tree | 361449d9c852d07544b16dd0daec5a72541e8bda /arch/sparc/Kconfig | |
| parent | ARM: fix misplaced arch_virt_to_idmap() (diff) | |
| parent | ARM: cci driver need big endian fixes in asm code (diff) | |
| download | linux-2098990e7c558c175b96213d41058983e00a7919.tar.xz linux-2098990e7c558c175b96213d41058983e00a7919.zip | |
Merge branch 'baserock/bjdooks/312-rc4/be/core-v3' of git://git.baserock.org/delta/linux into devel-stable
Conflicts:
arch/arm/kernel/head.S
This series has been well tested and it would be great to get this
merged now.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/sparc/Kconfig')
| -rw-r--r-- | arch/sparc/Kconfig | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 2137ad667438..78c4fdb91bc5 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@ -506,12 +506,17 @@ config SUN_OPENPROMFS Only choose N if you know in advance that you will not need to modify OpenPROM settings on the running system. -# Makefile helper +# Makefile helpers config SPARC64_PCI bool default y depends on SPARC64 && PCI +config SPARC64_PCI_MSI + bool + default y + depends on SPARC64_PCI && PCI_MSI + endmenu menu "Executable file formats" |