Commit a07c4a8c authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Krzysztof Kozlowski
Browse files

ARM: s3c64xx: remove mach/hardware.h 



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: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20200806182059.2431-19-krzk@kernel.org


Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
parent db8230d2

arch/arm/mach-s3c64xx/common.c

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 


#include <mach/map.h>

#include <mach/irqs.h>

#include <mach/hardware.h>

#include <mach/regs-gpio.h>

#include <mach/gpio-samsung.h>

arch/arm/mach-s3c64xx/dev-uart.c

+0 −1
Original line number Diff line number Diff line
@@ -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>

arch/arm/mach-s3c64xx/include/mach/hardware.h

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
/* 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 */

arch/arm/mach-s3c64xx/mach-anw6410.c

+0 −1
Original line number Diff line number Diff line
@@ -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>

arch/arm/mach-s3c64xx/mach-crag6410.c

+0 −1
Original line number Diff line number Diff line
@@ -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>