lkml.org 
[lkml]   [2019]   [Oct]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 12/36] ARM: s3c64xx: remove mach/hardware.h
    Date
    This header is empty and conflicts with the s3c24xx version
    of the same file when we merge the two, so stop including it.

    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    ---
    arch/arm/mach-s3c64xx/common.c | 1 -
    arch/arm/mach-s3c64xx/dev-uart.c | 1 -
    arch/arm/mach-s3c64xx/include/mach/hardware.h | 17 -----------------
    arch/arm/mach-s3c64xx/mach-anw6410.c | 1 -
    arch/arm/mach-s3c64xx/mach-crag6410.c | 1 -
    arch/arm/mach-s3c64xx/mach-hmt.c | 1 -
    arch/arm/mach-s3c64xx/mach-ncp.c | 1 -
    arch/arm/mach-s3c64xx/mach-smdk6400.c | 1 -
    arch/arm/mach-s3c64xx/mach-smdk6410.c | 1 -
    arch/arm/mach-s3c64xx/s3c6400.c | 1 -
    arch/arm/mach-s3c64xx/s3c6410.c | 1 -
    11 files changed, 27 deletions(-)
    delete mode 100644 arch/arm/mach-s3c64xx/include/mach/hardware.h

    diff --git a/arch/arm/mach-s3c64xx/common.c b/arch/arm/mach-s3c64xx/common.c
    index 13e91074308a..19d544f6808a 100644
    --- a/arch/arm/mach-s3c64xx/common.c
    +++ b/arch/arm/mach-s3c64xx/common.c
    @@ -36,7 +36,6 @@

    #include <mach/map.h>
    #include <mach/irqs.h>
    -#include <mach/hardware.h>
    #include <mach/regs-gpio.h>
    #include <mach/gpio-samsung.h>

    diff --git a/arch/arm/mach-s3c64xx/dev-uart.c b/arch/arm/mach-s3c64xx/dev-uart.c
    index 5fb59ad30008..021a2b7926fa 100644
    --- a/arch/arm/mach-s3c64xx/dev-uart.c
    +++ b/arch/arm/mach-s3c64xx/dev-uart.c
    @@ -15,7 +15,6 @@

    #include <asm/mach/arch.h>
    #include <asm/mach/irq.h>
    -#include <mach/hardware.h>
    #include <mach/map.h>
    #include <mach/irqs.h>

    diff --git a/arch/arm/mach-s3c64xx/include/mach/hardware.h b/arch/arm/mach-s3c64xx/include/mach/hardware.h
    deleted file mode 100644
    index c4ed359474de..000000000000
    --- a/arch/arm/mach-s3c64xx/include/mach/hardware.h
    +++ /dev/null
    @@ -1,17 +0,0 @@
    -/* SPDX-License-Identifier: GPL-2.0 */
    -/* linux/arch/arm/mach-s3c6400/include/mach/hardware.h
    - *
    - * Copyright 2008 Openmoko, Inc.
    - * Copyright 2008 Simtec Electronics
    - * Ben Dooks <ben@simtec.co.uk>
    - * http://armlinux.simtec.co.uk/
    - *
    - * S3C6400 - Hardware support
    - */
    -
    -#ifndef __ASM_ARCH_HARDWARE_H
    -#define __ASM_ARCH_HARDWARE_H __FILE__
    -
    -/* currently nothing here, placeholder */
    -
    -#endif /* __ASM_ARCH_IRQ_H */
    diff --git a/arch/arm/mach-s3c64xx/mach-anw6410.c b/arch/arm/mach-s3c64xx/mach-anw6410.c
    index 0d3d5befb806..44858c5aea5d 100644
    --- a/arch/arm/mach-s3c64xx/mach-anw6410.c
    +++ b/arch/arm/mach-s3c64xx/mach-anw6410.c
    @@ -30,7 +30,6 @@
    #include <asm/mach/map.h>
    #include <asm/mach/irq.h>

    -#include <mach/hardware.h>
    #include <mach/map.h>

    #include <asm/irq.h>
    diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c
    index 8ec6a4f5eb05..da5b50981a14 100644
    --- a/arch/arm/mach-s3c64xx/mach-crag6410.c
    +++ b/arch/arm/mach-s3c64xx/mach-crag6410.c
    @@ -44,7 +44,6 @@
    #include <asm/mach-types.h>

    #include <video/samsung_fimd.h>
    -#include <mach/hardware.h>
    #include <mach/map.h>
    #include <mach/regs-gpio.h>
    #include <mach/gpio-samsung.h>
    diff --git a/arch/arm/mach-s3c64xx/mach-hmt.c b/arch/arm/mach-s3c64xx/mach-hmt.c
    index bfe9881d12cc..a6634fd9e6c4 100644
    --- a/arch/arm/mach-s3c64xx/mach-hmt.c
    +++ b/arch/arm/mach-s3c64xx/mach-hmt.c
    @@ -25,7 +25,6 @@
    #include <asm/mach/irq.h>

    #include <video/samsung_fimd.h>
    -#include <mach/hardware.h>
    #include <mach/map.h>
    #include <mach/irqs.h>

    diff --git a/arch/arm/mach-s3c64xx/mach-ncp.c b/arch/arm/mach-s3c64xx/mach-ncp.c
    index 13fea5c86ca3..34a00b33fae9 100644
    --- a/arch/arm/mach-s3c64xx/mach-ncp.c
    +++ b/arch/arm/mach-s3c64xx/mach-ncp.c
    @@ -25,7 +25,6 @@
    #include <asm/mach/irq.h>

    #include <mach/irqs.h>
    -#include <mach/hardware.h>
    #include <mach/map.h>

    #include <asm/irq.h>
    diff --git a/arch/arm/mach-s3c64xx/mach-smdk6400.c b/arch/arm/mach-s3c64xx/mach-smdk6400.c
    index cbd16843c7d1..885158f0a304 100644
    --- a/arch/arm/mach-s3c64xx/mach-smdk6400.c
    +++ b/arch/arm/mach-s3c64xx/mach-smdk6400.c
    @@ -23,7 +23,6 @@
    #include <asm/mach/irq.h>

    #include <mach/irqs.h>
    -#include <mach/hardware.h>
    #include <mach/map.h>

    #include <plat/devs.h>
    diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c
    index 908e5aa831c8..95bdcfe95a53 100644
    --- a/arch/arm/mach-s3c64xx/mach-smdk6410.c
    +++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c
    @@ -45,7 +45,6 @@
    #include <asm/mach/map.h>
    #include <asm/mach/irq.h>

    -#include <mach/hardware.h>
    #include <mach/irqs.h>
    #include <mach/map.h>

    diff --git a/arch/arm/mach-s3c64xx/s3c6400.c b/arch/arm/mach-s3c64xx/s3c6400.c
    index 545eea716db8..81233495d548 100644
    --- a/arch/arm/mach-s3c64xx/s3c6400.c
    +++ b/arch/arm/mach-s3c64xx/s3c6400.c
    @@ -26,7 +26,6 @@
    #include <asm/mach/map.h>
    #include <asm/mach/irq.h>

    -#include <mach/hardware.h>
    #include <asm/irq.h>

    #include <plat/cpu-freq.h>
    diff --git a/arch/arm/mach-s3c64xx/s3c6410.c b/arch/arm/mach-s3c64xx/s3c6410.c
    index 47e04e019624..9465a6e0f068 100644
    --- a/arch/arm/mach-s3c64xx/s3c6410.c
    +++ b/arch/arm/mach-s3c64xx/s3c6410.c
    @@ -27,7 +27,6 @@
    #include <asm/mach/map.h>
    #include <asm/mach/irq.h>

    -#include <mach/hardware.h>
    #include <asm/irq.h>

    #include <plat/cpu-freq.h>
    --
    2.20.0
    \
     
     \ /
      Last update: 2019-10-10 22:41    [W:6.211 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site