diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-19 02:38:23 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-19 02:38:23 -0500 |
| commit | 198d6ba4d7f48c94f990f4604f0b3d73925e0ded (patch) | |
| tree | 56bbdf8ba2553c23c8099da9344a8f1d1aba97ab /arch/ia64/kvm/Kconfig | |
| parent | 9a57f7fabd383920585ed8b74eacd117c6551f2d (diff) | |
| parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/isdn/i4l/isdn_net.c
fs/cifs/connect.c
Diffstat (limited to 'arch/ia64/kvm/Kconfig')
| -rw-r--r-- | arch/ia64/kvm/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/ia64/kvm/Kconfig b/arch/ia64/kvm/Kconfig index 8e99fed6b3fd..f833a0b4188d 100644 --- a/arch/ia64/kvm/Kconfig +++ b/arch/ia64/kvm/Kconfig | |||
| @@ -20,6 +20,8 @@ if VIRTUALIZATION | |||
| 20 | config KVM | 20 | config KVM |
| 21 | tristate "Kernel-based Virtual Machine (KVM) support" | 21 | tristate "Kernel-based Virtual Machine (KVM) support" |
| 22 | depends on HAVE_KVM && EXPERIMENTAL | 22 | depends on HAVE_KVM && EXPERIMENTAL |
| 23 | # for device assignment: | ||
| 24 | depends on PCI | ||
| 23 | select PREEMPT_NOTIFIERS | 25 | select PREEMPT_NOTIFIERS |
| 24 | select ANON_INODES | 26 | select ANON_INODES |
| 25 | ---help--- | 27 | ---help--- |