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 branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
[sfrench/cifs-2.6.git]
/
arch
/
parisc
/
Kconfig
diff --git
a/arch/parisc/Kconfig
b/arch/parisc/Kconfig
index ce327c799b44c9d1591c0efbd157abc3b3edf11d..0b07922a2ac603e32451514a64a5250878389b5c 100644
(file)
--- a/
arch/parisc/Kconfig
+++ b/
arch/parisc/Kconfig
@@
-49,6
+49,10
@@
config ISA_DMA_API
bool
default y
+config ARCH_MAY_HAVE_PC_FDC
+ bool
+ default y
+
source "init/Kconfig"
@@
-190,6
+194,8
@@
source "fs/Kconfig.binfmt"
endmenu
+source "net/Kconfig"
+
source "drivers/Kconfig"
source "fs/Kconfig"