From 65c903c987de56381379a4ea5487cdea64fae40b Mon Sep 17 00:00:00 2001 From: Kukjin Kim Date: Tue, 1 Jan 2013 16:23:07 -0800 Subject: [PATCH] --- yaml --- r: 355254 b: refs/heads/master c: 6ccb2aedf51d79d07c8296f39bb0b82a246af6ae h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-exynos/dev-audio.c | 3 ++- .../arm/mach-exynos/include/mach/regs-audss.h | 18 ------------------ trunk/arch/arm/mach-s5pv210/dev-audio.c | 3 ++- .../arm/mach-s5pv210/include/mach/regs-audss.h | 18 ------------------ 5 files changed, 5 insertions(+), 39 deletions(-) delete mode 100644 trunk/arch/arm/mach-exynos/include/mach/regs-audss.h delete mode 100644 trunk/arch/arm/mach-s5pv210/include/mach/regs-audss.h diff --git a/[refs] b/[refs] index 3698fe707027..17c3b7b0ce1a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ccd458c15df62e4e7001a09b1b000b1fce696640 +refs/heads/master: 6ccb2aedf51d79d07c8296f39bb0b82a246af6ae diff --git a/trunk/arch/arm/mach-exynos/dev-audio.c b/trunk/arch/arm/mach-exynos/dev-audio.c index 9d1a60951d7b..c662c89794b2 100644 --- a/trunk/arch/arm/mach-exynos/dev-audio.c +++ b/trunk/arch/arm/mach-exynos/dev-audio.c @@ -21,7 +21,8 @@ #include #include #include -#include + +#define EXYNOS4_AUDSS_INT_MEM (0x03000000) static int exynos4_cfg_i2s(struct platform_device *pdev) { diff --git a/trunk/arch/arm/mach-exynos/include/mach/regs-audss.h b/trunk/arch/arm/mach-exynos/include/mach/regs-audss.h deleted file mode 100644 index ca5a8b64218a..000000000000 --- a/trunk/arch/arm/mach-exynos/include/mach/regs-audss.h +++ /dev/null @@ -1,18 +0,0 @@ -/* arch/arm/mach-exynos4/include/mach/regs-audss.h - * - * Copyright (c) 2011 Samsung Electronics - * http://www.samsung.com - * - * Exynos4 Audio SubSystem clock register definitions - * - * 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 __PLAT_REGS_AUDSS_H -#define __PLAT_REGS_AUDSS_H __FILE__ - -#define EXYNOS4_AUDSS_INT_MEM (0x03000000) - -#endif /* _PLAT_REGS_AUDSS_H */ diff --git a/trunk/arch/arm/mach-s5pv210/dev-audio.c b/trunk/arch/arm/mach-s5pv210/dev-audio.c index addfb165c13d..2d67361ef431 100644 --- a/trunk/arch/arm/mach-s5pv210/dev-audio.c +++ b/trunk/arch/arm/mach-s5pv210/dev-audio.c @@ -18,7 +18,8 @@ #include #include #include -#include + +#define S5PV210_AUDSS_INT_MEM (0xC0000000) static int s5pv210_cfg_i2s(struct platform_device *pdev) { diff --git a/trunk/arch/arm/mach-s5pv210/include/mach/regs-audss.h b/trunk/arch/arm/mach-s5pv210/include/mach/regs-audss.h deleted file mode 100644 index eacc1f790807..000000000000 --- a/trunk/arch/arm/mach-s5pv210/include/mach/regs-audss.h +++ /dev/null @@ -1,18 +0,0 @@ -/* arch/arm/mach-s5pv210/include/mach/regs-audss.h - * - * Copyright (c) 2011 Samsung Electronics - * http://www.samsung.com - * - * S5PV210 Audio SubSystem clock register definitions - * - * 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 __PLAT_REGS_AUDSS_H -#define __PLAT_REGS_AUDSS_H __FILE__ - -#define S5PV210_AUDSS_INT_MEM (0xC0000000) - -#endif /* _PLAT_REGS_AUDSS_H */