git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[pandora-kernel.git]
/
arch
/
m68k
/
Kconfig
diff --git
a/arch/m68k/Kconfig
b/arch/m68k/Kconfig
index
8030e24
..
77bb0d6
100644
(file)
--- a/
arch/m68k/Kconfig
+++ b/
arch/m68k/Kconfig
@@
-434,7
+434,7
@@
config PROC_HARDWARE
config ISA
bool
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
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
config GENERIC_ISA_DMA
bool
- depends on Q40 || AMIGA_PCMCIA
|| GG2
+ depends on Q40 || AMIGA_PCMCIA
default y
config ZONE_DMA
default y
config ZONE_DMA