projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
[powerpc.git]
/
arch
/
i386
/
Kconfig
diff --git
a/arch/i386/Kconfig
b/arch/i386/Kconfig
index
3b3b017
..
b22f003
100644
(file)
--- a/
arch/i386/Kconfig
+++ b/
arch/i386/Kconfig
@@
-37,6
+37,10
@@
config GENERIC_IOMAP
bool
default y
bool
default y
+config ARCH_MAY_HAVE_PC_FDC
+ bool
+ default y
+
source "init/Kconfig"
menu "Processor type and features"
source "init/Kconfig"
menu "Processor type and features"
@@
-1208,7
+1212,6
@@
config PCI_DIRECT
config PCI_MMCONFIG
bool
depends on PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY)
config PCI_MMCONFIG
bool
depends on PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY)
- select ACPI_BOOT
default y
source "drivers/pci/pcie/Kconfig"
default y
source "drivers/pci/pcie/Kconfig"
@@
-1318,6
+1321,11
@@
config GENERIC_IRQ_PROBE
bool
default y
bool
default y
+config GENERIC_PENDING_IRQ
+ bool
+ depends on GENERIC_HARDIRQS && SMP
+ default y
+
config X86_SMP
bool
depends on SMP && !X86_VOYAGER
config X86_SMP
bool
depends on SMP && !X86_VOYAGER