summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/prm33xx.c
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 /arch/arm/mach-omap2/prm33xx.c
parent49ea7fc094162fcaa83f5876b2090c816cc4498c (diff)
parent6ba54ab4a49bbad736b0254aa6bdf0cb83013815 (diff)
downloadblackbird-op-linux-9265c6a186ca19a57ab6ddd0b0f3644f85c6f2f1.tar.gz
blackbird-op-linux-9265c6a186ca19a57ab6ddd0b0f3644f85c6f2f1.zip
Merge branch 'omap/headers4' into next/cleanup
Diffstat (limited to 'arch/arm/mach-omap2/prm33xx.c')
-rw-r--r--arch/arm/mach-omap2/prm33xx.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/prm33xx.c b/arch/arm/mach-omap2/prm33xx.c
index e7dbb6cf1255..0d8abb577669 100644
--- a/arch/arm/mach-omap2/prm33xx.c
+++ b/arch/arm/mach-omap2/prm33xx.c
@@ -19,8 +19,6 @@
#include <linux/err.h>
#include <linux/io.h>
-#include <plat/common.h>
-
#include "common.h"
#include "prm33xx.h"
#include "prm-regbits-33xx.h"
OpenPOWER on IntegriCloud