diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-19 16:04:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-19 16:04:42 -0700 |
| commit | e72a68fc26887d2097fd7f14794aeb7c17851a5d (patch) | |
| tree | d7e6b740bf3c01cfc4b089653da7c16411ec6187 /arch/arm/plat-omap/devices.c | |
| parent | 1cce92aef225171705c3f53a871938abca2177de (diff) | |
| parent | 58005b325394b18b8b6a737e06b4128deb2c4e63 (diff) | |
| download | blackbird-obmc-linux-e72a68fc26887d2097fd7f14794aeb7c17851a5d.tar.gz blackbird-obmc-linux-e72a68fc26887d2097fd7f14794aeb7c17851a5d.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 5255/1: Update jornada ssp to remove build errors/warnings
[ARM] omap: back out 'internal_clock' support
[ARM] 5249/1: davinci: remove redundant check in davinci_psc_config()
Diffstat (limited to 'arch/arm/plat-omap/devices.c')
| -rw-r--r-- | arch/arm/plat-omap/devices.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c index bc1cf30c83e0..01da719a7453 100644 --- a/arch/arm/plat-omap/devices.c +++ b/arch/arm/plat-omap/devices.c @@ -316,19 +316,6 @@ static inline void omap_init_mmc_conf(const struct omap_mmc_config *mmc_conf) omap_cfg_reg(MMC_DAT3); } } -#if defined(CONFIG_ARCH_OMAP2420) - if (mmc_conf->mmc[0].internal_clock) { - /* - * Use internal loop-back in MMC/SDIO - * Module Input Clock selection - */ - if (cpu_is_omap24xx()) { - u32 v = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0); - v |= (1 << 24); /* not used in 243x */ - omap_ctrl_writel(v, OMAP2_CONTROL_DEVCONF0); - } - } -#endif } #ifdef CONFIG_ARCH_OMAP16XX |
