lkml.org 
[lkml]   [2009]   [Jun]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH, v3] eeepc-laptop: Fix build failure with HOTPLUG_PCI && !SYSFS
    Ingo Molnar wrote:
    > * Ingo Molnar <mingo@elte.hu> 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
    >
    > -------------------->
    > From de3e1cacc93ca48a288e27af5e82a365ba90020f Mon Sep 17 00:00:00 2001
    > From: Ingo Molnar <mingo@elte.hu>
    > Date: Mon, 29 Jun 2009 10:07:54 +0200
    > Subject: [PATCH] eeepc-laptop: Fix build failure with HOTPLUG_PCI && !SYSFS (was: ACPI & driver patches for 2.6.31-rc1)
    >
    > FYI, there's a post-rc1 build regression with certain configs:
    >
    > drivers/built-in.o: In function `pci_hp_deregister':
    > (.text+0xb166): undefined reference to `pci_hp_remove_module_link'
    > drivers/built-in.o: In function `pci_hp_deregister':
    > (.text+0xb19f): undefined reference to `pci_destroy_slot'
    > drivers/built-in.o: In function `__pci_hp_register':
    > (.text+0xb583): undefined reference to `pci_create_slot'
    > drivers/built-in.o: In function `__pci_hp_register':
    > (.text+0xb5b1): undefined reference to `pci_hp_create_module_link'
    > make: *** [.tmp_vmlinux1] Error 1
    >
    > Caused by:
    >
    > | 2b121bc262fa03c94e653b2d44356c2f86c1bcdc is first bad commit
    > | commit 2b121bc262fa03c94e653b2d44356c2f86c1bcdc
    > | Date: Thu Jun 25 13:25:36 2009 +0200
    > |
    > | eeepc-laptop: Register as a pci-hotplug device
    >
    > The problem is caused by this portion of the commit:
    >
    > Signed-off-by: Ingo Molnar <mingo@elte.hu>

    Ack. Thanks for fixing this.


    > ---
    > drivers/platform/x86/Kconfig | 3 +--
    > 1 files changed, 1 insertions(+), 2 deletions(-)
    >
    > diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
    > index 4bc72d0..c0be866 100644
    > --- a/drivers/platform/x86/Kconfig
    > +++ b/drivers/platform/x86/Kconfig
    > @@ -356,10 +356,9 @@ config EEEPC_LAPTOP
    > depends on INPUT
    > depends on EXPERIMENTAL
    > depends on RFKILL || RFKILL = n
    > + depends on HOTPLUG_PCI
    > select BACKLIGHT_CLASS_DEVICE
    > select HWMON
    > - select HOTPLUG
    > - select HOTPLUG_PCI if PCI
    > ---help---
    > This driver supports the Fn-Fx keys on Eee PC laptops.
    >


    --
    ~Randy
    LPC 2009, Sept. 23-25, Portland, Oregon
    http://linuxplumbersconf.org/2009/


    \
     
     \ /
      Last update: 2009-06-29 17:33    [W:0.026 / U:61.736 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site