From 590b5033560eb6fdfad2e0decdc44c4be4caeab5 Mon Sep 17 00:00:00 2001
From: David Brownell <david-b@pacbell.net>
Date: Tue, 8 May 2007 00:25:29 -0700
Subject: [PATCH] --- yaml --- r: 54571 b: refs/heads/master c:
 2e17c5508fa015f2c7690e29041f437e9308c64f h: refs/heads/master i:   54569:
 f97196c57dd70846a8096930c4d9bbd18b8f40b6   54567:
 e4778cf3d319e2b0343ad3066a581ad25fa22c35 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/pnp/core.c  | 3 +++
 trunk/include/linux/pnp.h | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 488b30234154..42d0998547ac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f8bc500a10ab9cb3861e5bb71155d7bd2bbd2d5
+refs/heads/master: 2e17c5508fa015f2c7690e29041f437e9308c64f
diff --git a/trunk/drivers/pnp/core.c b/trunk/drivers/pnp/core.c
index aec83ec5ea23..d8d75541552c 100644
--- a/trunk/drivers/pnp/core.c
+++ b/trunk/drivers/pnp/core.c
@@ -14,6 +14,7 @@
 #include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/errno.h>
+#include <linux/dma-mapping.h>
 
 #include "base.h"
 
@@ -114,6 +115,8 @@ int __pnp_add_device(struct pnp_dev *dev)
 	int ret;
 	pnp_fixup_device(dev);
 	dev->dev.bus = &pnp_bus_type;
+	dev->dev.dma_mask = &dev->dma_mask;
+	dev->dma_mask = dev->dev.coherent_dma_mask = DMA_24BIT_MASK;
 	dev->dev.release = &pnp_release_device;
 	dev->status = PNP_READY;
 	spin_lock(&pnp_lock);
diff --git a/trunk/include/linux/pnp.h b/trunk/include/linux/pnp.h
index 9a5226f0f169..00dae5ba128a 100644
--- a/trunk/include/linux/pnp.h
+++ b/trunk/include/linux/pnp.h
@@ -177,6 +177,7 @@ static inline void pnp_set_card_drvdata (struct pnp_card_link *pcard, void *data
 
 struct pnp_dev {
 	struct device dev;		/* Driver Model device interface */
+	u64 dma_mask;
 	unsigned char number;		/* used as an index, must be unique */
 	int status;