Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit efa25ffd authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-cleanup-3' of... 

Merge tag 'samsung-cleanup-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup3

Merge "Samsung 3rd cleanup for v3.15" from Kukjin Kim:

- Remove <mach/hardware.h> in mach-exynos
- Remove invalid code from <mach/hardware.h> in mach-s3c24xx

Note that this is based on previous tags/samsung-cleanup-2

* tag 'samsung-cleanup-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

:
  ARM: EXYNOS: Remove hardware.h file
  ARM: SAMSUNG: Remove hardware.h inclusion
  ARM: S3C24XX: Remove invalid code from hardware.h

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents cd5f48a7 1aa9c483

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

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
/* linux/arch/arm/mach-exynos4/include/mach/hardware.h

 *

 * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.

 *		http://www.samsung.com

 *

 * EXYNOS4 - Hardware support

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

*/



#ifndef __ASM_ARCH_HARDWARE_H

#define __ASM_ARCH_HARDWARE_H __FILE__



/* currently nothing here, placeholder */



#endif /* __ASM_ARCH_HARDWARE_H */

arch/arm/mach-exynos/platsmp.c

+0 −2
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ 
#include <asm/smp_scu.h>

#include <asm/firmware.h>



#include <mach/hardware.h>



#include <plat/cpu.h>



#include "common.h"

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

+1 −13
Original line number Diff line number Diff line 
/* arch/arm/mach-s3c2410/include/mach/hardware.h

 *

/*

 * Copyright (c) 2003 Simtec Electronics

 *	Ben Dooks <ben@simtec.co.uk>

 *
@@ -17,20 +16,9 @@ 


extern unsigned int s3c2410_modify_misccr(unsigned int clr, unsigned int chg);



#ifdef CONFIG_CPU_S3C2440



extern int s3c2440_set_dsc(unsigned int pin, unsigned int value);



#endif /* CONFIG_CPU_S3C2440 */



#endif /* __ASSEMBLY__ */



#include <asm/sizes.h>

#include <mach/map.h>



/* machine specific hardware definitions should go after this */



/* currently here until moved into config (todo) */

#define CONFIG_NO_MULTIWORD_IO



#endif /* __ASM_ARCH_HARDWARE_H */

arch/arm/plat-samsung/clock.c

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ 
#include <linux/debugfs.h>

#endif



#include <mach/hardware.h>

#include <asm/irq.h>



#include <plat/cpu-freq.h>

arch/arm/plat-samsung/devs.c

+1 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <linux/mtd/partitions.h>

#include <linux/mmc/host.h>

#include <linux/ioport.h>

#include <linux/sizes.h>

#include <linux/platform_data/s3c-hsudc.h>

#include <linux/platform_data/s3c-hsotg.h>

#include <linux/platform_data/dma-s3c24xx.h>
@@ -42,7 +43,6 @@ 
#include <asm/mach/map.h>

#include <asm/mach/irq.h>



#include <mach/hardware.h>

#include <mach/dma.h>

#include <mach/irqs.h>

#include <mach/map.h>