diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-08 15:21:04 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-08 15:21:04 -0500 |
| commit | 988addf82e4c03739375279de73929580a2d4a6a (patch) | |
| tree | 989ae1cd4e264bbad80c65f04480486246e7b9f3 /arch/arm/mach-omap2/clock3517.h | |
| parent | 004c1c7096659d352b83047a7593e91d8a30e3c5 (diff) | |
| parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 (diff) | |
Merge branch 'origin' into devel-stable
Conflicts:
arch/arm/mach-mx2/devices.c
arch/arm/mach-mx2/devices.h
sound/soc/pxa/pxa-ssp.c
Diffstat (limited to 'arch/arm/mach-omap2/clock3517.h')
| -rw-r--r-- | arch/arm/mach-omap2/clock3517.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/clock3517.h b/arch/arm/mach-omap2/clock3517.h new file mode 100644 index 000000000000..ca5e5a64c2e2 --- /dev/null +++ b/arch/arm/mach-omap2/clock3517.h | |||
| @@ -0,0 +1,14 @@ | |||
| 1 | /* | ||
| 2 | * OMAP3517/3505 clock function prototypes and macros | ||
| 3 | * | ||
| 4 | * Copyright (C) 2010 Texas Instruments, Inc. | ||
| 5 | * Copyright (C) 2010 Nokia Corporation | ||
| 6 | */ | ||
| 7 | |||
| 8 | #ifndef __ARCH_ARM_MACH_OMAP2_CLOCK3517_H | ||
| 9 | #define __ARCH_ARM_MACH_OMAP2_CLOCK3517_H | ||
| 10 | |||
| 11 | extern const struct clkops clkops_am35xx_ipss_module_wait; | ||
| 12 | extern const struct clkops clkops_am35xx_ipss_wait; | ||
| 13 | |||
| 14 | #endif | ||