lkml.org 
[lkml]   [2018]   [Sep]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 3/3] ARM: OMAP1: ams-delta: make board header file local to mach-omap1
    Date
    Now as board header file is no longer included by drivers, move it to
    the root directory of mach-omap1.

    Signed-off-by: Janusz Krzysztofik <jmkrzyszt@gmail.com>
    ---
    arch/arm/mach-omap1/ams-delta-fiq-handler.S | 2 +-
    arch/arm/mach-omap1/ams-delta-fiq.c | 3 +--
    arch/arm/mach-omap1/board-ams-delta.c | 2 +-
    arch/arm/mach-omap1/{include/mach => }/board-ams-delta.h | 2 +-
    4 files changed, 4 insertions(+), 5 deletions(-)
    rename arch/arm/mach-omap1/{include/mach => }/board-ams-delta.h (98%)

    diff --git a/arch/arm/mach-omap1/ams-delta-fiq-handler.S b/arch/arm/mach-omap1/ams-delta-fiq-handler.S
    index ddc27638ba2a..2e2a17364dc9 100644
    --- a/arch/arm/mach-omap1/ams-delta-fiq-handler.S
    +++ b/arch/arm/mach-omap1/ams-delta-fiq-handler.S
    @@ -17,9 +17,9 @@
    #include <linux/platform_data/ams-delta-fiq.h>

    #include <asm/assembler.h>
    -#include <mach/board-ams-delta.h>

    #include "ams-delta-fiq.h"
    +#include "board-ams-delta.h"
    #include "iomap.h"
    #include "soc.h"

    diff --git a/arch/arm/mach-omap1/ams-delta-fiq.c b/arch/arm/mach-omap1/ams-delta-fiq.c
    index b0dc7ddf5877..14c3d3f5255e 100644
    --- a/arch/arm/mach-omap1/ams-delta-fiq.c
    +++ b/arch/arm/mach-omap1/ams-delta-fiq.c
    @@ -22,11 +22,10 @@
    #include <linux/platform_data/ams-delta-fiq.h>
    #include <linux/platform_device.h>

    -#include <mach/board-ams-delta.h>
    -
    #include <asm/fiq.h>

    #include "ams-delta-fiq.h"
    +#include "board-ams-delta.h"

    static struct fiq_handler fh = {
    .name = "ams-delta-fiq"
    diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c
    index dd28d2614d7f..34cb63ff45b3 100644
    --- a/arch/arm/mach-omap1/board-ams-delta.c
    +++ b/arch/arm/mach-omap1/board-ams-delta.c
    @@ -36,7 +36,6 @@
    #include <asm/mach/arch.h>
    #include <asm/mach/map.h>

    -#include <mach/board-ams-delta.h>
    #include <linux/platform_data/keypad-omap.h>
    #include <mach/mux.h>

    @@ -45,6 +44,7 @@
    #include <mach/usb.h>

    #include "ams-delta-fiq.h"
    +#include "board-ams-delta.h"
    #include "iomap.h"
    #include "common.h"

    diff --git a/arch/arm/mach-omap1/include/mach/board-ams-delta.h b/arch/arm/mach-omap1/board-ams-delta.h
    similarity index 98%
    rename from arch/arm/mach-omap1/include/mach/board-ams-delta.h
    rename to arch/arm/mach-omap1/board-ams-delta.h
    index ad6f865d1f16..1fbada29431a 100644
    --- a/arch/arm/mach-omap1/include/mach/board-ams-delta.h
    +++ b/arch/arm/mach-omap1/board-ams-delta.h
    @@ -1,5 +1,5 @@
    /*
    - * arch/arm/plat-omap/include/mach/board-ams-delta.h
    + * arch/arm/mach-omap1/board-ams-delta.h
    *
    * Copyright (C) 2006 Jonathan McDowell <noodles@earth.li>
    *
    --
    2.16.4
    \
     
     \ /
      Last update: 2018-09-10 04:48    [W:4.252 / U:0.324 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site