[PATCH, v3] eeepc-laptop: Fix build failure with HOTPLUG_PCI &&!SYSFS (was: [git pull request] ACPI & driver patches for2.6.31-rc1)

[Ingo Molnar]

* Ingo Molnar <mingo@xxxxxxx> wrote:

> > The patch below fixes the build failure by turning the select 
> > lines into a single 'depends on' line. [...]
> 
> i did the fix against the bisection point and the patch has a 
> conflict against later mainline - below is a merged up patch.

> -	select HOTPLUG
> -	select HOTPLUG_PCI if PCI
> +       select HOTPLUG
> +       select HOTPLUG_PCI if PCI

uhm, not a very nice conflict resolution this is.

The one below is actually tested ;-)

	Ingo

-------------------->