diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2015-07-28 18:58:26 (GMT) |
|---|---|---|
| committer | Stephen Boyd <sboyd@codeaurora.org> | 2015-07-28 18:58:26 (GMT) |
| commit | 4d341056202a4725777ed99897f6456405819cd4 (patch) | |
| tree | 45fb9d229bacf995aabcad282937568e5201b5a7 /arch/arm/mach-omap2/clock3517.h | |
| parent | e306479ac252928b84cc563c6e790f9b7e7ae427 (diff) | |
| parent | 989feafb84118a840ff21250a1e5f516f43e3dbb (diff) | |
| download | linux-4d341056202a4725777ed99897f6456405819cd4.tar.xz | |
Merge branch 'for-4.2/ti-clk-move' of https://github.com/t-kristo/linux-pm into clk-next
From Tero Kristo:
"This pull request contains the TI clock driver set to move the
clock implementations under clock driver. Some small portions of
the clock driver code still remain under mach-omap2 after this,
it should be decided whether this code is now obsolete and should
be deleted or should someone try to fix it."
Slight merge conflicts with determine_rate prototype changes.
Diffstat (limited to 'arch/arm/mach-omap2/clock3517.h')
| -rw-r--r-- | arch/arm/mach-omap2/clock3517.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/arch/arm/mach-omap2/clock3517.h b/arch/arm/mach-omap2/clock3517.h deleted file mode 100644 index ca5e5a6..0000000 --- a/arch/arm/mach-omap2/clock3517.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * OMAP3517/3505 clock function prototypes and macros - * - * Copyright (C) 2010 Texas Instruments, Inc. - * Copyright (C) 2010 Nokia Corporation - */ - -#ifndef __ARCH_ARM_MACH_OMAP2_CLOCK3517_H -#define __ARCH_ARM_MACH_OMAP2_CLOCK3517_H - -extern const struct clkops clkops_am35xx_ipss_module_wait; -extern const struct clkops clkops_am35xx_ipss_wait; - -#endif |