diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-23 04:33:35 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-23 04:33:35 +0400 |
| commit | 80c226fbef56576946c9655fcb2ab62e63404d12 (patch) | |
| tree | f5f565c370aeb0de257a4e3825c0873af54590e8 /arch/m68k/Kconfig | |
| parent | 2c15bd00a5d6b2b64e006e91e2196f0c6a764cb6 (diff) | |
| parent | 779b7e64b536ff65bcd40c0292871d2bb9b6d6e5 (diff) | |
| download | linux-80c226fbef56576946c9655fcb2ab62e63404d12.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Add missing I/O macros {in,out}{w,l}_p() for !CONFIG_ISA
m68k: Remove big kernel lock in cache flush code
m68k: __pa(): cast arg to long
fbdev: atafb - Remove undead ifdef ATAFB_FALCON
zorro: Fix device_register() error handling
fbdev/m68k: Fix section mismatches in q40fb.c
m68k/m68knommu: merge the MMU and non-MMU traps.h
m68k/m68knommu: merge MMU and non-MMU thread_info.h
m68k/m68knommu: merge MMU and non-MMU atomic.h
m68k/m68knommu: clean up page.h
m68k/m68knommu: merge machdep.h files into a single file
m68k/m68knommu: merge MMU and non-MMU string.h
m68k/m68knommu: Remove dead SMP config option
m68k: move definition of THREAD_SIZE into thread_info_mm.h
m68k: Use asm-generic/ioctls.h (enables termiox)
m68k: Remove dead GG2 config option
Diffstat (limited to 'arch/m68k/Kconfig')
| -rw-r--r-- | arch/m68k/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig index 8030e2481d97..77bb0d6baa62 100644 --- a/arch/m68k/Kconfig +++ b/arch/m68k/Kconfig @@ -434,7 +434,7 @@ config PROC_HARDWARE config ISA bool - depends on Q40 || AMIGA_PCMCIA || GG2 + depends on Q40 || AMIGA_PCMCIA default y help Find out whether you have ISA slots on your motherboard. ISA is the @@ -445,7 +445,7 @@ config ISA config GENERIC_ISA_DMA bool - depends on Q40 || AMIGA_PCMCIA || GG2 + depends on Q40 || AMIGA_PCMCIA default y config ZONE_DMA |