diff options
| author | Tony Lindgren | 2012-11-09 23:54:17 +0100 |
|---|---|---|
| committer | Tony Lindgren | 2012-11-09 23:54:17 +0100 |
| commit | f56f52e02a9c3da4bc2cc6eb9ddcf5602ea44b37 (patch) | |
| tree | a9ce4f46ea3b2e516698b2c3817e40414a8bbf51 /drivers/staging/tidspbridge | |
| parent | Merge branch 'for_3.8/dts_part2' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | ARM: OMAP: Remove omap_init_consistent_dma_size() (diff) | |
| download | kernel-qcow2-linux-f56f52e02a9c3da4bc2cc6eb9ddcf5602ea44b37.tar.gz kernel-qcow2-linux-f56f52e02a9c3da4bc2cc6eb9ddcf5602ea44b37.tar.xz kernel-qcow2-linux-f56f52e02a9c3da4bc2cc6eb9ddcf5602ea44b37.zip | |
Merge branch 'omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3' into omap-for-v3.8/dt
Conflicts:
arch/arm/plat-omap/dmtimer.c
Resolved as suggested by Jon Hunter.
Diffstat (limited to 'drivers/staging/tidspbridge')
| -rw-r--r-- | drivers/staging/tidspbridge/include/dspbridge/host_os.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/tidspbridge/include/dspbridge/host_os.h b/drivers/staging/tidspbridge/include/dspbridge/host_os.h index 5e2f4d82d925..7f3a1db31619 100644 --- a/drivers/staging/tidspbridge/include/dspbridge/host_os.h +++ b/drivers/staging/tidspbridge/include/dspbridge/host_os.h @@ -40,7 +40,6 @@ #include <linux/vmalloc.h> #include <linux/ioport.h> #include <linux/platform_device.h> -#include <plat/clock.h> #include <linux/clk.h> #include <plat/mailbox.h> #include <linux/pagemap.h> |