Hi Gregory,
Today's linux-next merge of the alacrity tree got a conflict in
arch/x86/Kconfig between commit 388b78adc989 ("rapidio: modify
configuration to support PCI-SRIO controller") from Linus' tree and
commit 18dc365707fd ("vbus: add a "vbus-proxy" bus model for vbus_driver
objects") from the alacrity tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc arch/x86/Kconfig
index cc6c53a,035edb7..0000000
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -2097,16 -2067,8 +2097,18 @@@ source "drivers/pcmcia/Kconfig
source "drivers/pci/hotplug/Kconfig"
+config RAPIDIO
+ bool "RapidIO support"
+ depends on PCI
+ default n
+ help
+ If you say Y here, the kernel will include drivers and
+ infrastructure code to support RapidIO interconnect devices.
+
+source "drivers/rapidio/Kconfig"
+
+ source "drivers/vbus/Kconfig"
+
endmenu
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
