git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
[safe/jmp/linux-2.6]
/
drivers
/
acpi
/
Kconfig
diff --git
a/drivers/acpi/Kconfig
b/drivers/acpi/Kconfig
index
250d41a
..
735f5ea
100644
(file)
--- a/
drivers/acpi/Kconfig
+++ b/
drivers/acpi/Kconfig
@@
-4,8
+4,6
@@
menuconfig ACPI
bool "ACPI (Advanced Configuration and Power Interface) Support"
- depends on !X86_NUMAQ
- depends on !X86_VISWS
depends on !IA64_HP_SIM
depends on IA64 || X86
depends on PCI