diff --git a/[refs] b/[refs]
index de43eb652f95..017a0ee332b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e86b19ce64a25d39bb0e10e0e695213fc5993dfb
+refs/heads/master: 00412be1d7bdf451653c7dafeb09f4f83398d756
diff --git a/trunk/drivers/base/isa.c b/trunk/drivers/base/isa.c
index d2222397a401..efd577574948 100644
--- a/trunk/drivers/base/isa.c
+++ b/trunk/drivers/base/isa.c
@@ -7,6 +7,7 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/dma-mapping.h>
 #include <linux/isa.h>
 
 static struct device isa_bus = {
@@ -141,6 +142,9 @@ int isa_register_driver(struct isa_driver *isa_driver, unsigned int ndev)
 		isa_dev->dev.release		= isa_dev_release;
 		isa_dev->id			= id;
 
+		isa_dev->dev.coherent_dma_mask = DMA_24BIT_MASK;
+		isa_dev->dev.dma_mask = &isa_dev->dev.coherent_dma_mask;
+
 		error = device_register(&isa_dev->dev);
 		if (error) {
 			put_device(&isa_dev->dev);