diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-10 11:41:50 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-10 11:41:50 -0400 |
| commit | f0006314d37639714da9658cf4ff3f1f9f420764 (patch) | |
| tree | b8a18e014a40f2f8fd5148aab09c869dfaabd7a9 /include/asm-arm/arch-imx/hardware.h | |
| parent | a177ba3b7a08beef3f0fe74efa0f90701891945a (diff) | |
| parent | 1bd55a436f1f90de0e7f476e514e01bd67497b88 (diff) | |
Merge branch 'imx' into devel
Conflicts:
arch/arm/mm/Kconfig
Diffstat (limited to 'include/asm-arm/arch-imx/hardware.h')
| -rw-r--r-- | include/asm-arm/arch-imx/hardware.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/asm-arm/arch-imx/hardware.h b/include/asm-arm/arch-imx/hardware.h index adffb6acf42a..6542ca5e8c33 100644 --- a/include/asm-arm/arch-imx/hardware.h +++ b/include/asm-arm/arch-imx/hardware.h | |||
| @@ -73,14 +73,6 @@ | |||
| 73 | */ | 73 | */ |
| 74 | extern void imx_gpio_mode( int gpio_mode ); | 74 | extern void imx_gpio_mode( int gpio_mode ); |
| 75 | 75 | ||
| 76 | /* get frequencies in Hz */ | ||
| 77 | extern unsigned int imx_get_system_clk(void); | ||
| 78 | extern unsigned int imx_get_mcu_clk(void); | ||
| 79 | extern unsigned int imx_get_perclk1(void); /* UART[12], Timer[12], PWM */ | ||
| 80 | extern unsigned int imx_get_perclk2(void); /* LCD, SD, SPI[12] */ | ||
| 81 | extern unsigned int imx_get_perclk3(void); /* SSI */ | ||
| 82 | extern unsigned int imx_get_hclk(void); /* SDRAM, CSI, Memory Stick,*/ | ||
| 83 | /* I2C, DMA */ | ||
| 84 | #endif | 76 | #endif |
| 85 | 77 | ||
| 86 | #define MAXIRQNUM 62 | 78 | #define MAXIRQNUM 62 |