diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-04-13 21:29:07 (GMT) |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-04-13 21:29:07 (GMT) |
commit | f499cae1e59d75d5eb24c23d47cf8986e6032c6d (patch) | |
tree | 1af6235c18391212c40116eb90b01eae8938efee /drivers/pnp/card.c | |
parent | fc3f55e672e1ed917dd9e215af81939cd3d717da (diff) | |
parent | 80a04d3f2f94fb68b5df05e3ac6697130bc3467a (diff) | |
download | linux-fsl-qoriq-f499cae1e59d75d5eb24c23d47cf8986e6032c6d.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/pnp/card.c')
-rw-r--r-- | drivers/pnp/card.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pnp/card.c b/drivers/pnp/card.c index efea128..4a651f6 100644 --- a/drivers/pnp/card.c +++ b/drivers/pnp/card.c @@ -167,7 +167,7 @@ struct pnp_card *pnp_alloc_card(struct pnp_protocol *protocol, int id, char *pnp card->dev.parent = &card->protocol->dev; dev_set_name(&card->dev, "%02x:%02x", card->protocol->number, card->number); - card->dev.coherent_dma_mask = DMA_24BIT_MASK; + card->dev.coherent_dma_mask = DMA_BIT_MASK(24); card->dev.dma_mask = &card->dev.coherent_dma_mask; dev_id = pnp_add_card_id(card, pnpid); |