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 master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
arch
/
sparc
/
Kconfig
diff --git
a/arch/sparc/Kconfig
b/arch/sparc/Kconfig
index
8567cc9
..
9d327ec
100644
(file)
--- a/
arch/sparc/Kconfig
+++ b/
arch/sparc/Kconfig
@@
-21,6
+21,12
@@
config GENERIC_ISA_DMA
bool
default y
bool
default y
+config ARCH_NO_VIRT_TO_BUS
+ def_bool y
+
+config OF
+ def_bool y
+
source "init/Kconfig"
menu "General machine setup"
source "init/Kconfig"
menu "General machine setup"
@@
-217,6
+223,9
@@
source "drivers/pci/Kconfig"
endif
endif
+config NO_DMA
+ def_bool !PCI
+
config SUN_OPENPROMFS
tristate "Openprom tree appears in /proc/openprom"
help
config SUN_OPENPROMFS
tristate "Openprom tree appears in /proc/openprom"
help