diff --git a/[refs] b/[refs] index 4adcb20866db..a81175539cbd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f309db33e7868fe11f8fc3a0dd291703df3c662 +refs/heads/master: af44f5bf775e0d36aa5879c94369216ff6f717a6 diff --git a/trunk/drivers/net/smc91x.h b/trunk/drivers/net/smc91x.h index 7089d86e857a..a9b06b8d8e3f 100644 --- a/trunk/drivers/net/smc91x.h +++ b/trunk/drivers/net/smc91x.h @@ -188,7 +188,7 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg) #define SMC_IRQ_TRIGGER_TYPE (( \ machine_is_omap_h2() \ || machine_is_omap_h3() \ - || (machine_is_omap_innovator() && !cpu_is_omap150()) \ + || (machine_is_omap_innovator() && !cpu_is_omap1510()) \ ) ? IRQT_FALLING : IRQT_RISING)