git.samba.org
/
sfrench
/
cifs-2.6.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/davem/net-next-2.6
[sfrench/cifs-2.6.git]
/
arch
/
powerpc
/
configs
/
44x
/
bamboo_defconfig
diff --git
a/arch/powerpc/configs/44x/bamboo_defconfig
b/arch/powerpc/configs/44x/bamboo_defconfig
index 959bdc43a49183b3c51be7c7161bc91fe5d6137e..e57f1e4c1795196a3f6fddb2abedc41fc143628a 100644
(file)
--- a/
arch/powerpc/configs/44x/bamboo_defconfig
+++ b/
arch/powerpc/configs/44x/bamboo_defconfig
@@
-262,7
+262,7
@@
CONFIG_PCI_SYSCALL=y
# CONFIG_PCIEPORTBUS is not set
CONFIG_ARCH_SUPPORTS_MSI=y
# CONFIG_PCI_MSI is not set
-CONFIG_PCI_LEGACY=y
+# CONFIG_PCI_LEGACY is not set
# CONFIG_PCI_DEBUG is not set
# CONFIG_PCI_STUB is not set
# CONFIG_PCCARD is not set