mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-19 02:34:01 +08:00
Samsung 3rd cleanup for v3.15
- 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 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJTK02lAAoJEA0Cl+kVi2xq8goP/i9o/pp36ZnX7UBoQZnNkk64 SzZ97Lwr6fgvQ3BQDxSZUq3UVTjcAEoFkWTYeTOEqDfqscG7QzYTjovkaVMdXYgN xpXXl1XO8Dt6epLFxaFJnHdFiC9mNDJg4X8yx/OnsPzcyAHBwm12qVq25XRxvFGj xLnEhSpPgBuDa/sRvD8TGPEWsKoh0c/I7V9hAXOOzQRVICVB+1ELqQw2bSyFFkSq s9NvqwzZ9TliaCDLHTcGMAp8CnPYKcsplQ2CTvFW/TWhYyc6AzP5StjpHk1djGfg s1V5DA4s3g+467fgbzSQ/URMA2VGSGejCJx194TwygnjZxlMVNPlUnWnR0xDf1mc 56fMihETWQ8vnKBNk1IaqYN5JbmBaS30eCirc+iyDgyr7XA9p7kxZz2xODFTekYV 230CPhSQdzt7qNIvgRzyqoTySmhvpGpLLow0xxjk441zkgrMmEjx82izaMEX/rgt D/aazVrbmWAylpLb8tMfuoCV+GhihXYzbNqyjghb+cb7e6YWFbMdVxYGqGvoCdI6 Pw5xncH0fjadWCefZDeHkAeJhE9cTTz97BfOjwEfrQO7h6PxI3F8gjMV0s49Dz6m nRXiddeZ6jbQ0HO+vDnXQXrDQKFboyIe1U55S3415vUQCytcCA21OmSmJeWZGjk7 Rbq3mB8v5uRbKL9gmd8Q =tCfV -----END PGP SIGNATURE----- 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: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
commit
efa25ffdd6
@ -1,18 +0,0 @@
|
|||||||
/* 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 */
|
|
@ -26,8 +26,6 @@
|
|||||||
#include <asm/smp_scu.h>
|
#include <asm/smp_scu.h>
|
||||||
#include <asm/firmware.h>
|
#include <asm/firmware.h>
|
||||||
|
|
||||||
#include <mach/hardware.h>
|
|
||||||
|
|
||||||
#include <plat/cpu.h>
|
#include <plat/cpu.h>
|
||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
/* arch/arm/mach-s3c2410/include/mach/hardware.h
|
/*
|
||||||
*
|
|
||||||
* Copyright (c) 2003 Simtec Electronics
|
* Copyright (c) 2003 Simtec Electronics
|
||||||
* Ben Dooks <ben@simtec.co.uk>
|
* Ben Dooks <ben@simtec.co.uk>
|
||||||
*
|
*
|
||||||
@ -17,20 +16,9 @@
|
|||||||
|
|
||||||
extern unsigned int s3c2410_modify_misccr(unsigned int clr, unsigned int chg);
|
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__ */
|
#endif /* __ASSEMBLY__ */
|
||||||
|
|
||||||
#include <asm/sizes.h>
|
#include <asm/sizes.h>
|
||||||
#include <mach/map.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 */
|
#endif /* __ASM_ARCH_HARDWARE_H */
|
||||||
|
@ -43,7 +43,6 @@
|
|||||||
#include <linux/debugfs.h>
|
#include <linux/debugfs.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <mach/hardware.h>
|
|
||||||
#include <asm/irq.h>
|
#include <asm/irq.h>
|
||||||
|
|
||||||
#include <plat/cpu-freq.h>
|
#include <plat/cpu-freq.h>
|
||||||
|
@ -31,6 +31,7 @@
|
|||||||
#include <linux/mtd/partitions.h>
|
#include <linux/mtd/partitions.h>
|
||||||
#include <linux/mmc/host.h>
|
#include <linux/mmc/host.h>
|
||||||
#include <linux/ioport.h>
|
#include <linux/ioport.h>
|
||||||
|
#include <linux/sizes.h>
|
||||||
#include <linux/platform_data/s3c-hsudc.h>
|
#include <linux/platform_data/s3c-hsudc.h>
|
||||||
#include <linux/platform_data/s3c-hsotg.h>
|
#include <linux/platform_data/s3c-hsotg.h>
|
||||||
#include <linux/platform_data/dma-s3c24xx.h>
|
#include <linux/platform_data/dma-s3c24xx.h>
|
||||||
@ -42,7 +43,6 @@
|
|||||||
#include <asm/mach/map.h>
|
#include <asm/mach/map.h>
|
||||||
#include <asm/mach/irq.h>
|
#include <asm/mach/irq.h>
|
||||||
|
|
||||||
#include <mach/hardware.h>
|
|
||||||
#include <mach/dma.h>
|
#include <mach/dma.h>
|
||||||
#include <mach/irqs.h>
|
#include <mach/irqs.h>
|
||||||
#include <mach/map.h>
|
#include <mach/map.h>
|
||||||
|
@ -25,8 +25,6 @@
|
|||||||
#include <linux/platform_device.h>
|
#include <linux/platform_device.h>
|
||||||
#include <linux/of.h>
|
#include <linux/of.h>
|
||||||
|
|
||||||
#include <mach/hardware.h>
|
|
||||||
|
|
||||||
#include <asm/mach/arch.h>
|
#include <asm/mach/arch.h>
|
||||||
#include <asm/mach/map.h>
|
#include <asm/mach/map.h>
|
||||||
|
|
||||||
|
@ -25,7 +25,6 @@
|
|||||||
#include <asm/suspend.h>
|
#include <asm/suspend.h>
|
||||||
|
|
||||||
#ifdef CONFIG_SAMSUNG_ATAGS
|
#ifdef CONFIG_SAMSUNG_ATAGS
|
||||||
#include <mach/hardware.h>
|
|
||||||
#include <mach/map.h>
|
#include <mach/map.h>
|
||||||
#ifndef CONFIG_ARCH_EXYNOS
|
#ifndef CONFIG_ARCH_EXYNOS
|
||||||
#include <mach/regs-clock.h>
|
#include <mach/regs-clock.h>
|
||||||
|
@ -18,7 +18,6 @@
|
|||||||
|
|
||||||
#include <asm/mach/arch.h>
|
#include <asm/mach/arch.h>
|
||||||
#include <asm/mach/irq.h>
|
#include <asm/mach/irq.h>
|
||||||
#include <mach/hardware.h>
|
|
||||||
#include <mach/map.h>
|
#include <mach/map.h>
|
||||||
|
|
||||||
#include <plat/devs.h>
|
#include <plat/devs.h>
|
||||||
|
Loading…
Reference in New Issue
Block a user