lkml.org 
[lkml]   [2009]   [Feb]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 01/15] ide: include <asm/ide.h> only when needed
    From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    Subject: [PATCH] ide: include <asm/ide.h> only when needed

    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    ---
    drivers/ide/ide-io-std.c | 7 +++++++
    drivers/ide/tx4938ide.c | 2 ++
    drivers/ide/tx4939ide.c | 2 ++
    include/linux/ide.h | 7 -------
    4 files changed, 11 insertions(+), 7 deletions(-)

    Index: b/drivers/ide/ide-io-std.c
    ===================================================================
    --- a/drivers/ide/ide-io-std.c
    +++ b/drivers/ide/ide-io-std.c
    @@ -2,6 +2,13 @@
    #include <linux/kernel.h>
    #include <linux/ide.h>

    +#if defined(CONFIG_ARM) || defined(CONFIG_M68K) || defined(CONFIG_MIPS) || \
    + defined(CONFIG_PARISC) || defined(CONFIG_PPC) || defined(CONFIG_SPARC)
    +#include <asm/ide.h>
    +#else
    +#include <asm-generic/ide_iops.h>
    +#endif
    +
    /*
    * Conventional PIO operations for ATA devices
    */
    Index: b/drivers/ide/tx4938ide.c
    ===================================================================
    --- a/drivers/ide/tx4938ide.c
    +++ b/drivers/ide/tx4938ide.c
    @@ -15,6 +15,8 @@
    #include <linux/init.h>
    #include <linux/platform_device.h>
    #include <linux/io.h>
    +
    +#include <asm/ide.h>
    #include <asm/txx9/tx4938.h>

    static void tx4938ide_tune_ebusc(unsigned int ebus_ch,
    Index: b/drivers/ide/tx4939ide.c
    ===================================================================
    --- a/drivers/ide/tx4939ide.c
    +++ b/drivers/ide/tx4939ide.c
    @@ -18,6 +18,8 @@
    #include <linux/io.h>
    #include <linux/scatterlist.h>

    +#include <asm/ide.h>
    +
    #define MODNAME "tx4939ide"

    /* ATA Shadow Registers (8-bit except for Data which is 16-bit) */
    Index: b/include/linux/ide.h
    ===================================================================
    --- a/include/linux/ide.h
    +++ b/include/linux/ide.h
    @@ -193,13 +193,6 @@ static inline void ide_std_init_ports(hw
    hw->io_ports.ctl_addr = ctl_addr;
    }

    -#if defined(CONFIG_ARM) || defined(CONFIG_M68K) || defined(CONFIG_MIPS) || \
    - defined(CONFIG_PARISC) || defined(CONFIG_PPC) || defined(CONFIG_SPARC)
    -#include <asm/ide.h>
    -#else
    -#include <asm-generic/ide_iops.h>
    -#endif
    -
    #define MAX_HWIFS 10

    /*

    \
     
     \ /
      Last update: 2009-02-01 18:51    [W:0.020 / U:210.672 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site