diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-02-05 08:48:03 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-02-05 08:48:03 -0500 |
| commit | 2faea5274f079630991800bd579f85a621f96ef5 (patch) | |
| tree | 4afb9032f0ae3a3e8b539e0abe40cda320989ac3 /arch/arm/mach-imx/iram_alloc.c | |
| parent | 16c5ab1d3a6d1b11ed2966fa33a3a4fecd13a2bc (diff) | |
| parent | edac894389f9c9de2a1368c78809c824b343f3a5 (diff) | |
Merge branch 'for-linus' into for-next
Merge pending fixes that haven't pulled into 3.8.
Diffstat (limited to 'arch/arm/mach-imx/iram_alloc.c')
| -rw-r--r-- | arch/arm/mach-imx/iram_alloc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/iram_alloc.c b/arch/arm/mach-imx/iram_alloc.c index 6c80424f678e..e05cf407db65 100644 --- a/arch/arm/mach-imx/iram_alloc.c +++ b/arch/arm/mach-imx/iram_alloc.c | |||
| @@ -22,8 +22,7 @@ | |||
| 22 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 23 | #include <linux/spinlock.h> | 23 | #include <linux/spinlock.h> |
| 24 | #include <linux/genalloc.h> | 24 | #include <linux/genalloc.h> |
| 25 | 25 | #include "linux/platform_data/imx-iram.h" | |
| 26 | #include "iram.h" | ||
| 27 | 26 | ||
| 28 | static unsigned long iram_phys_base; | 27 | static unsigned long iram_phys_base; |
| 29 | static void __iomem *iram_virt_base; | 28 | static void __iomem *iram_virt_base; |