diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2012-09-13 15:22:55 +0200 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2012-10-15 04:03:11 +0200 |
commit | c045e3f137362fa34b337cdca66d3f6000a3b094 (patch) | |
tree | aad31c8d34fe88b3e2886c27d28cc5d9571204ae /arch/arm/mach-imx/include | |
parent | ARM: imx: include iim.h rather than mach/iim.h (diff) | |
download | linux-c045e3f137362fa34b337cdca66d3f6000a3b094.tar.xz linux-c045e3f137362fa34b337cdca66d3f6000a3b094.zip |
ARM: imx: include iram.h rather than mach/iram.h
Rename mach-imx/include/mach/iram.h to mach-imx/iram.h, and update users
to include iram.h rather than mach/iram.h.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-imx/include')
-rw-r--r-- | arch/arm/mach-imx/include/mach/iram.h | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/arch/arm/mach-imx/include/mach/iram.h b/arch/arm/mach-imx/include/mach/iram.h deleted file mode 100644 index 022690c33702..000000000000 --- a/arch/arm/mach-imx/include/mach/iram.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2010 Freescale Semiconductor, Inc. All Rights Reserved. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -#include <linux/errno.h> - -#ifdef CONFIG_IRAM_ALLOC - -int __init iram_init(unsigned long base, unsigned long size); -void __iomem *iram_alloc(unsigned int size, unsigned long *dma_addr); -void iram_free(unsigned long dma_addr, unsigned int size); - -#else - -static inline int __init iram_init(unsigned long base, unsigned long size) -{ - return -ENOMEM; -} - -static inline void __iomem *iram_alloc(unsigned int size, unsigned long *dma_addr) -{ - return NULL; -} - -static inline void iram_free(unsigned long base, unsigned long size) {} - -#endif |