diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-19 18:10:44 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-19 18:10:44 +0200 |
| commit | c8f85523e70f8202ff49858bacd72fa65245f382 (patch) | |
| tree | d0dbb5f5662094e90ecdef0b486000368d8f6e7d /arch/arm/mach-omap1 | |
| parent | ARM: set vga memory base at run-time (diff) | |
| parent | ARM: Consolidate the clkdev header files (diff) | |
| download | linux-c8f85523e70f8202ff49858bacd72fa65245f382.tar.xz linux-c8f85523e70f8202ff49858bacd72fa65245f382.zip | |
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.h | 5 |
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 ea8640e4603e..000000000000 --- 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> |