Re: Linux 2.4.15-pre4 - merge with Alan

[Greg KH]

On Mon, Nov 12, 2001 at 11:01:56AM -0800, Linus Torvalds wrote:
> 
> Which means that I'd also like people to double-check that there are no
> embarrassing missing pieces due to the merge (or other patches).

This tiny patch to arch/i386/config.in is needed to be able to select
the PCI Hotplug driver so that it can be used.

thanks,

greg k-h

diff --minimal -Nru a/arch/i386/config.in b/arch/i386/config.in
--- a/arch/i386/config.in	Mon Nov 12 11:34:30 2001
+++ b/arch/i386/config.in	Mon Nov 12 11:34:30 2001
@@ -234,8 +234,10 @@
 
 if [ "$CONFIG_HOTPLUG" = "y" ] ; then
    source drivers/pcmcia/Config.in
+   source drivers/hotplug/Config.in
 else
    define_bool CONFIG_PCMCIA n
+   define_bool CONFIG_HOTPLUG_PCI n
 fi
 
 bool 'System V IPC' CONFIG_SYSVIPC