[lkml]   [2010]   [Aug]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    Patch in this message
    Subject[PATCH] of: Fix missing includes
    This patch fixes missing includes from a number of .c files because
    the code (wrongfully) depended on prom.h including them. The include
    of linux/of_address.h was removed in microblaze prom.h in commit
    "of/address: Clean up function declarations" (sha1 id 22ae782f8), but
    not fixed in some users. This patch fixes them up.

    Signed-off-by: Grant Likely <>

    Hi Michal, here's my patch that fixes the microblaze include issues. I've
    got it in my merge-devicetree branch which I'll be asking Linus to pull on
    tommorrow after it has been through cross-arch build testing (unless I hear
    otherwise from you).


    arch/microblaze/pci/pci-common.c | 3 ++-
    arch/microblaze/pci/xilinx_pci.c | 1 +
    drivers/char/xilinx_hwicap/xilinx_hwicap.c | 1 +
    drivers/serial/of_serial.c | 3 +--
    4 files changed, 5 insertions(+), 3 deletions(-)

    diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c
    index 6ca8531..55ef532 100644
    --- a/arch/microblaze/pci/pci-common.c
    +++ b/arch/microblaze/pci/pci-common.c
    @@ -27,10 +27,11 @@
    #include <linux/irq.h>
    #include <linux/vmalloc.h>
    #include <linux/slab.h>
    +#include <linux/of.h>
    +#include <linux/of_address.h>

    #include <asm/processor.h>
    #include <asm/io.h>
    -#include <asm/prom.h>
    #include <asm/pci-bridge.h>
    #include <asm/byteorder.h>

    diff --git a/arch/microblaze/pci/xilinx_pci.c b/arch/microblaze/pci/xilinx_pci.c
    index 7869a41..0687a42 100644
    --- a/arch/microblaze/pci/xilinx_pci.c
    +++ b/arch/microblaze/pci/xilinx_pci.c
    @@ -16,6 +16,7 @@

    #include <linux/ioport.h>
    #include <linux/of.h>
    +#include <linux/of_address.h>
    #include <linux/pci.h>
    #include <asm/io.h>

    diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.c b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
    index 0ed763c..b663d57 100644
    --- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c
    +++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
    @@ -94,6 +94,7 @@

    #ifdef CONFIG_OF
    /* For open firmware. */
    +#include <linux/of_address.h>
    #include <linux/of_device.h>
    #include <linux/of_platform.h>
    diff --git a/drivers/serial/of_serial.c b/drivers/serial/of_serial.c
    index 659a695..2af8fd1 100644
    --- a/drivers/serial/of_serial.c
    +++ b/drivers/serial/of_serial.c
    @@ -14,11 +14,10 @@
    #include <linux/slab.h>
    #include <linux/serial_core.h>
    #include <linux/serial_8250.h>
    +#include <linux/of_address.h>
    #include <linux/of_platform.h>
    #include <linux/nwpserial.h>

    -#include <asm/prom.h>
    struct of_serial_info {
    int type;
    int line;

     \ /
      Last update: 2010-08-17 08:03    [W:0.021 / U:32.272 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site