diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-10 18:17:52 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-10 18:17:52 -0400 |
| commit | 0b019a41553a919965bb02d07d54e3e6c57a796d (patch) | |
| tree | 6e329b4159b440d2aac5200a5c07103fe261c096 /arch/arm/mach-s5pv210/dev-audio.c | |
| parent | 5f6878b0d22f9b93f9698f88c335007e2a3c3bbc (diff) | |
| parent | 054d5c9238f3c577ad51195c3ee7803613f322cc (diff) | |
Merge branches 'master' and 'devel' into for-linus
Conflicts:
arch/arm/Kconfig
arch/arm/mm/Kconfig
Diffstat (limited to 'arch/arm/mach-s5pv210/dev-audio.c')
| -rw-r--r-- | arch/arm/mach-s5pv210/dev-audio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s5pv210/dev-audio.c b/arch/arm/mach-s5pv210/dev-audio.c index 6e215330a1be..21dc6cf955c3 100644 --- a/arch/arm/mach-s5pv210/dev-audio.c +++ b/arch/arm/mach-s5pv210/dev-audio.c | |||
| @@ -10,11 +10,11 @@ | |||
| 10 | 10 | ||
| 11 | #include <linux/platform_device.h> | 11 | #include <linux/platform_device.h> |
| 12 | #include <linux/dma-mapping.h> | 12 | #include <linux/dma-mapping.h> |
| 13 | #include <linux/gpio.h> | ||
| 13 | 14 | ||
| 14 | #include <plat/gpio-cfg.h> | 15 | #include <plat/gpio-cfg.h> |
| 15 | #include <plat/audio.h> | 16 | #include <plat/audio.h> |
| 16 | 17 | ||
| 17 | #include <mach/gpio.h> | ||
| 18 | #include <mach/map.h> | 18 | #include <mach/map.h> |
| 19 | #include <mach/dma.h> | 19 | #include <mach/dma.h> |
| 20 | #include <mach/irqs.h> | 20 | #include <mach/irqs.h> |