lkml.org 
[lkml]   [2011]   [Jul]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 04/12] gma500: Fix symbol clash with i915
    Date
    From: Alan Cox <alan@linux.intel.com>

    Randy Dunlap reports:
    | when both CONFIG_DRM_I915=y and CONFIG_DRM_PSB=y:
    | drivers/staging/built-in.o: In function `intel_opregion_init':
    | (.text+0x47943): multiple definition of `intel_opregion_init'
    | drivers/gpu/built-in.o:(.text+0x17277a): first defined here

    Signed-off-by: Alan Cox <alan@linux.intel.com>
    ---

    drivers/staging/gma500/cdv_device.c | 2 +-
    drivers/staging/gma500/intel_opregion.c | 4 ++--
    drivers/staging/gma500/psb_device.c | 2 +-
    drivers/staging/gma500/psb_drv.c | 2 +-
    drivers/staging/gma500/psb_drv.h | 4 ++--
    5 files changed, 7 insertions(+), 7 deletions(-)

    diff --git a/drivers/staging/gma500/cdv_device.c b/drivers/staging/gma500/cdv_device.c
    index 680f1bb..3729a97 100644
    --- a/drivers/staging/gma500/cdv_device.c
    +++ b/drivers/staging/gma500/cdv_device.c
    @@ -319,7 +319,7 @@ static void cdv_get_core_freq(struct drm_device *dev)
    static int cdv_chip_setup(struct drm_device *dev)
    {
    cdv_get_core_freq(dev);
    - intel_opregion_init(dev);
    + gma_intel_opregion_init(dev);
    psb_intel_init_bios(dev);
    return 0;
    }
    diff --git a/drivers/staging/gma500/intel_opregion.c b/drivers/staging/gma500/intel_opregion.c
    index 8240965..d2e6037 100644
    --- a/drivers/staging/gma500/intel_opregion.c
    +++ b/drivers/staging/gma500/intel_opregion.c
    @@ -47,7 +47,7 @@ struct opregion_acpi {
    /*FIXME: add it later*/
    } __packed;

    -int intel_opregion_init(struct drm_device *dev)
    +int gma_intel_opregion_init(struct drm_device *dev)
    {
    struct drm_psb_private *dev_priv = dev->dev_private;
    u32 opregion_phy;
    @@ -71,7 +71,7 @@ int intel_opregion_init(struct drm_device *dev)
    return 0;
    }

    -int intel_opregion_exit(struct drm_device *dev)
    +int gma_intel_opregion_exit(struct drm_device *dev)
    {
    struct drm_psb_private *dev_priv = dev->dev_private;
    if (dev_priv->lid_state)
    diff --git a/drivers/staging/gma500/psb_device.c b/drivers/staging/gma500/psb_device.c
    index 0774c06..e26a176 100644
    --- a/drivers/staging/gma500/psb_device.c
    +++ b/drivers/staging/gma500/psb_device.c
    @@ -322,7 +322,7 @@ static void psb_get_core_freq(struct drm_device *dev)
    static int psb_chip_setup(struct drm_device *dev)
    {
    psb_get_core_freq(dev);
    - intel_opregion_init(dev);
    + gma_intel_opregion_init(dev);
    psb_intel_init_bios(dev);
    return 0;
    }
    diff --git a/drivers/staging/gma500/psb_drv.c b/drivers/staging/gma500/psb_drv.c
    index 264fdf4..397b605 100644
    --- a/drivers/staging/gma500/psb_drv.c
    +++ b/drivers/staging/gma500/psb_drv.c
    @@ -245,7 +245,7 @@ static int psb_driver_unload(struct drm_device *dev)

    if (dev_priv) {
    psb_lid_timer_takedown(dev_priv);
    - intel_opregion_exit(dev);
    + gma_intel_opregion_exit(dev);

    psb_do_takedown(dev);

    diff --git a/drivers/staging/gma500/psb_drv.h b/drivers/staging/gma500/psb_drv.h
    index c19045f..f5ecd6d 100644
    --- a/drivers/staging/gma500/psb_drv.h
    +++ b/drivers/staging/gma500/psb_drv.h
    @@ -728,8 +728,8 @@ extern void mdfld_disable_te(struct drm_device *dev, int pipe);
    /*
    * intel_opregion.c
    */
    -extern int intel_opregion_init(struct drm_device *dev);
    -extern int intel_opregion_exit(struct drm_device *dev);
    +extern int gma_intel_opregion_init(struct drm_device *dev);
    +extern int gma_intel_opregion_exit(struct drm_device *dev);

    /*
    * framebuffer.c


    \
     
     \ /
      Last update: 2011-07-08 10:55    [W:0.027 / U:0.652 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site