diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-01 13:50:58 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-01 13:50:58 -0400 |
| commit | 974857266aae29c371ac2313ab520616335caec9 (patch) | |
| tree | 9c2c67433a2783f29fe1f99cf44380b4fbb725af /drivers/xen/Kconfig | |
| parent | 5ed0505c713805f89473cdc0bbfb5110dfd840cb (diff) | |
| parent | 07961ac7c0ee8b546658717034fe692fd12eefa9 (diff) | |
Merge v3.9-rc5 into char-misc-next
This picks up the fixes in 3.9-rc5 that we need here.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/xen/Kconfig')
| -rw-r--r-- | drivers/xen/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig index 5a32232cf7c1..67af155cf602 100644 --- a/drivers/xen/Kconfig +++ b/drivers/xen/Kconfig | |||
| @@ -182,7 +182,7 @@ config XEN_PRIVCMD | |||
| 182 | 182 | ||
| 183 | config XEN_STUB | 183 | config XEN_STUB |
| 184 | bool "Xen stub drivers" | 184 | bool "Xen stub drivers" |
| 185 | depends on XEN && X86_64 | 185 | depends on XEN && X86_64 && BROKEN |
| 186 | default n | 186 | default n |
| 187 | help | 187 | help |
| 188 | Allow kernel to install stub drivers, to reserve space for Xen drivers, | 188 | Allow kernel to install stub drivers, to reserve space for Xen drivers, |