# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.845   -> 1.846  
#	drivers/mca/mca-bus.c	1.1     -> 1.2    
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/11/21	jejb@mulgrave.(none)	1.846
# make mca-bus.c use generic device dma_mask
# --------------------------------------------
#
diff -Nru a/drivers/mca/mca-bus.c b/drivers/mca/mca-bus.c
--- a/drivers/mca/mca-bus.c	Thu Nov 21 14:33:46 2002
+++ b/drivers/mca/mca-bus.c	Thu Nov 21 14:33:46 2002
@@ -143,9 +143,7 @@
 	mca_dev->dev.bus = &mca_bus_type;
 	sprintf (mca_dev->dev.bus_id, "%02d:%02X", bus, mca_dev->slot);
 	mca_dev->dma_mask = mca_bus->default_dma_mask;
-	/* FIXME: uncomment this when we get a global idea of where
-	 * dma_mask goes */
-	//mca_dev->dev.dma_mask = &mca_dev->dma_mask;
+	mca_dev->dev.dma_mask = &mca_dev->dma_mask;
 
 	if (device_register(&mca_dev->dev))
 		return 0;