lkml.org 
[lkml]   [2011]   [Jul]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subjectsungem: fix compile failure caused by trivial #include consolidation
    From
    Date
    This patch:

    commit e44ba033c5654dbfda53461c9b1f7dd9bd1d198f
    Author: Vitaliy Ivanov <vitalivanov@gmail.com>
    Date: Mon Jun 20 16:08:07 2011 +0200

    treewide: remove duplicate includes

    Causes this compile failure on parisc:

    CC [M] drivers/net/sungem.o
    drivers/net/sungem.c:49:22: error: asm/prom.h: No such file or directory
    make[2]: *** [drivers/net/sungem.o] Error 1

    Only Sparc and PPC actually have the asm/prom.h include, so you can't
    consolidate it outside of the ifdefs.

    Signed-off-by: James Bottomley <JBottomley@Parallels.com>

    ---

    This really shouldn't be happening with a trivial patch, since it's an
    obviously non-trivial transformation ... I assume the duplicate include
    checker isn't taking #ifdefs into account?

    James

    commit e44ba033c5654dbfda53461c9b1f7dd9bd1d198f
    Author: Vitaliy Ivanov <vitalivanov@gmail.com>
    Date: Mon Jun 20 16:08:07 2011 +0200

    treewide: remove duplicate includes

    Many stupid corrections of duplicated includes based on the output of
    scripts/checkincludes.pl.

    Signed-off-by: Vitaliy Ivanov <vitalivanov@gmail.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>

    diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
    index ab59300..70f018d 100644
    --- a/drivers/net/sungem.c
    +++ b/drivers/net/sungem.c
    @@ -66,15 +66,14 @@
    #include <asm/byteorder.h>
    #include <asm/uaccess.h>
    #include <asm/irq.h>
    +#include <asm/prom.h>

    #ifdef CONFIG_SPARC
    #include <asm/idprom.h>
    -#include <asm/prom.h>
    #endif

    #ifdef CONFIG_PPC_PMAC
    #include <asm/pci-bridge.h>
    -#include <asm/prom.h>
    #include <asm/machdep.h>
    #include <asm/pmac_feature.h>
    #endif



    \
     
     \ /
      Last update: 2011-07-29 16:11    [W:0.021 / U:29.792 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site