2 files changed, 3 insertions, 3 deletions

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 0048f1185a60..8083d862ebc5 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -397,7 +397,7 @@ config FB_SA1100
 
 config FB_IMX
         tristate "Motorola i.MX LCD support"
-        depends on FB && (ARCH_IMX || ARCH_MX2)
+        depends on FB && (ARCH_MX1 || ARCH_MX2)
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
diff --git a/drivers/video/mx3fb.c b/drivers/video/mx3fb.c
index 9894de1c9b9f..b7af5256e887 100644
--- a/drivers/video/mx3fb.c
+++ b/drivers/video/mx3fb.c
@@ -706,7 +706,7 @@ static void mx3fb_dma_done(void *arg)
         dev_dbg(mx3fb->dev, "irq %d callback\n", ichannel->eof_irq);
 
         /* We only need one interrupt, it will be re-enabled as needed */
-        disable_irq(ichannel->eof_irq);
+        disable_irq_nosync(ichannel->eof_irq);
 
         complete(&mx3_fbi->flip_cmpl);
 }
@@ -1366,7 +1366,7 @@ static int init_fb_chan(struct mx3fb_data *mx3fb, struct idmac_channel *ichan)
 
         mx3fb_blank(FB_BLANK_UNBLANK, fbi);
 
-        dev_info(dev, "mx3fb: fb registered, using mode %s\n", fb_mode);
+        dev_info(dev, "registered, using mode %s\n", fb_mode);
 
         ret = register_framebuffer(fbi);
         if (ret < 0)