diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-21 16:56:56 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-21 16:56:56 -0500 |
| commit | 2d13ccaa8797d7e599f3792aed4b1e44b47f94a5 (patch) | |
| tree | 7079c1610373fc6709c3a285a53099beaf21295a /arch/m68k/Kconfig.bus | |
| parent | 59136ef3c596606d3eef920dc3e0fdfa2ce52c6f (diff) | |
| parent | 11f1c5de7be06bbb51363002ebc4d00edc2677df (diff) | |
Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable
Conflicts:
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/mach-omap2/board-omap4panda.c
arch/arm/mach-omap2/include/mach/omap4-common.h
arch/arm/plat-omap/include/plat/irqs.h
The changes to omap4-common.h were moved to arch/arm/mach-omap2/common.h
and the other trivial conflicts resolved. The now empty ifdef in irqs.h
was also eliminated.
Diffstat (limited to 'arch/m68k/Kconfig.bus')
| -rw-r--r-- | arch/m68k/Kconfig.bus | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/m68k/Kconfig.bus b/arch/m68k/Kconfig.bus index 8294f0c1785e..3adb499584fb 100644 --- a/arch/m68k/Kconfig.bus +++ b/arch/m68k/Kconfig.bus | |||
| @@ -2,6 +2,15 @@ if MMU | |||
| 2 | 2 | ||
| 3 | comment "Bus Support" | 3 | comment "Bus Support" |
| 4 | 4 | ||
| 5 | config DIO | ||
| 6 | bool "DIO bus support" | ||
| 7 | depends on HP300 | ||
| 8 | default y | ||
| 9 | help | ||
| 10 | Say Y here to enable support for the "DIO" expansion bus used in | ||
| 11 | HP300 machines. If you are using such a system you almost certainly | ||
| 12 | want this. | ||
| 13 | |||
| 5 | config NUBUS | 14 | config NUBUS |
| 6 | bool | 15 | bool |
| 7 | depends on MAC | 16 | depends on MAC |