Merge /spare/repo/linux-2.6/

1 files changed, 3 insertions, 0 deletions

diff --git a/arch/arm/plat-omap/mux.c b/arch/arm/plat-omap/mux.c
index ea7b955b9c81..64482040f89e 100644
--- a/arch/arm/plat-omap/mux.c
+++ b/arch/arm/plat-omap/mux.c
@@ -48,6 +48,9 @@ omap_cfg_reg(const reg_cfg_t reg_cfg)
                 pull_orig = 0, pull = 0;
         unsigned int mask, warn = 0;
 
+        if (cpu_is_omap7xx())
+                return 0;
+
         if (reg_cfg > ARRAY_SIZE(reg_cfg_table)) {
                 printk(KERN_ERR "MUX: reg_cfg %d\n", reg_cfg);
                 return -EINVAL;