Merge commit 'kumar/merge' into merge

/*

 * Contains routines needed to support swiotlb for ppc.

 *

 * Copyright (C) 2009 Becky Bruce, Freescale Semiconductor

 * Copyright (C) 2009-2010 Freescale Semiconductor, Inc.

 * Author: Becky Bruce

 *

 * This program is free software; you can redistribute  it and/or modify it

 * under  the terms of  the GNU General  Public License as published by the

	sd->max_direct_dma_addr = 0;

	/* May need to bounce if the device can't address all of DRAM */

	if (dma_get_mask(dev) < lmb_end_of_DRAM())

	if ((dma_get_mask(dev) + 1) < lmb_end_of_DRAM())

		set_dma_ops(dev, &swiotlb_dma_ops);

	return NOTIFY_DONE;