summaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-11-15 17:06:24 +0100
committerArnd Bergmann <arnd@arndb.de>2012-11-15 17:06:24 +0100
commit9265c6a186ca19a57ab6ddd0b0f3644f85c6f2f1 (patch)
treed8c434ea98ee541ee17f4df87bb8e9020ce29b98 /drivers/staging
parent49ea7fc094162fcaa83f5876b2090c816cc4498c (diff)
parent6ba54ab4a49bbad736b0254aa6bdf0cb83013815 (diff)
downloadop-kernel-dev-9265c6a186ca19a57ab6ddd0b0f3644f85c6f2f1.zip
op-kernel-dev-9265c6a186ca19a57ab6ddd0b0f3644f85c6f2f1.tar.gz
Merge branch 'omap/headers4' into next/cleanup
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/tidspbridge/include/dspbridge/host_os.h1
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 5e2f4d8..7f3a1db 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>
OpenPOWER on IntegriCloud