diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-05 22:52:54 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nico@fluxnic.net> | 2011-10-13 12:49:37 -0400 |
| commit | 9d25544968f831e97e858bd8ec2933f225126ca8 (patch) | |
| tree | 28433ef020d658a1c8a78a7e078bf95b3c49834c /arch/arm | |
| parent | d8c9e024e300cc3dfccf96050368880ef1669426 (diff) | |
ARM: mach-msm: remove mach/memory.h
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-msm/include/mach/memory.h | 35 |
2 files changed, 1 insertions, 35 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 4633cb919b83..fcc8ca9b351b 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -660,6 +660,7 @@ config ARCH_MSM | |||
| 660 | select GENERIC_CLOCKEVENTS | 660 | select GENERIC_CLOCKEVENTS |
| 661 | select ARCH_REQUIRE_GPIOLIB | 661 | select ARCH_REQUIRE_GPIOLIB |
| 662 | select CLKDEV_LOOKUP | 662 | select CLKDEV_LOOKUP |
| 663 | select NO_MACH_MEMORY_H | ||
| 663 | help | 664 | help |
| 664 | Support for Qualcomm MSM/QSD based systems. This runs on the | 665 | Support for Qualcomm MSM/QSD based systems. This runs on the |
| 665 | apps processor of the MSM/QSD and depends on a shared memory | 666 | apps processor of the MSM/QSD and depends on a shared memory |
diff --git a/arch/arm/mach-msm/include/mach/memory.h b/arch/arm/mach-msm/include/mach/memory.h deleted file mode 100644 index 58d5e7eec431..000000000000 --- a/arch/arm/mach-msm/include/mach/memory.h +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | /* arch/arm/mach-msm/include/mach/memory.h | ||
| 2 | * | ||
| 3 | * Copyright (C) 2007 Google, Inc. | ||
| 4 | * | ||
| 5 | * This software is licensed under the terms of the GNU General Public | ||
| 6 | * License version 2, as published by the Free Software Foundation, and | ||
| 7 | * may be copied, distributed, and modified under those terms. | ||
| 8 | * | ||
| 9 | * This program is distributed in the hope that it will be useful, | ||
| 10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 12 | * GNU General Public License for more details. | ||
| 13 | * | ||
| 14 | */ | ||
| 15 | |||
| 16 | #ifndef __ASM_ARCH_MEMORY_H | ||
| 17 | #define __ASM_ARCH_MEMORY_H | ||
| 18 | |||
| 19 | /* physical offset of RAM */ | ||
| 20 | #if defined(CONFIG_ARCH_QSD8X50) && defined(CONFIG_MSM_SOC_REV_A) | ||
| 21 | #define PLAT_PHYS_OFFSET UL(0x00000000) | ||
| 22 | #elif defined(CONFIG_ARCH_QSD8X50) | ||
| 23 | #define PLAT_PHYS_OFFSET UL(0x20000000) | ||
| 24 | #elif defined(CONFIG_ARCH_MSM7X30) | ||
| 25 | #define PLAT_PHYS_OFFSET UL(0x00000000) | ||
| 26 | #elif defined(CONFIG_ARCH_MSM8X60) | ||
| 27 | #define PLAT_PHYS_OFFSET UL(0x40000000) | ||
| 28 | #elif defined(CONFIG_ARCH_MSM8960) | ||
| 29 | #define PLAT_PHYS_OFFSET UL(0x40000000) | ||
| 30 | #else | ||
| 31 | #define PLAT_PHYS_OFFSET UL(0x10000000) | ||
| 32 | #endif | ||
| 33 | |||
| 34 | #endif | ||
| 35 | |||