summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap1
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-07-19 16:10:44 (GMT)
committerArnd Bergmann <arnd@arndb.de>2011-07-19 16:10:44 (GMT)
commitc8f85523e70f8202ff49858bacd72fa65245f382 (patch)
treed0dbb5f5662094e90ecdef0b486000368d8f6e7d /arch/arm/mach-omap1
parentcc22b4c18540e5e8bf55c7d124044f9317527d3c (diff)
parentaa3831cf9d29cfeaebd8c2169378b74111364487 (diff)
downloadlinux-fsl-qoriq-c8f85523e70f8202ff49858bacd72fa65245f382.tar.xz
Merge branch 'cross-platform/clkdev' into next/cross-platform
Diffstat (limited to 'arch/arm/mach-omap1')
-rw-r--r--arch/arm/mach-omap1/include/mach/clkdev.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/mach-omap1/include/mach/clkdev.h b/arch/arm/mach-omap1/include/mach/clkdev.h
deleted file mode 100644
index ea8640e..0000000
--- a/arch/arm/mach-omap1/include/mach/clkdev.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
- * arch/arm/mach-omap1/include/mach/clkdev.h
- */
-
-#include <plat/clkdev.h>