Merge ../bleed-2.6

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/alpha/kernel/pci-noop.c b/arch/alpha/kernel/pci-noop.c
index 582a3519fb28..9903e3a79102 100644
--- a/arch/alpha/kernel/pci-noop.c
+++ b/arch/alpha/kernel/pci-noop.c
@@ -154,7 +154,7 @@ pci_dma_supported(struct pci_dev *hwdev, dma_addr_t mask)
 
 void *
 dma_alloc_coherent(struct device *dev, size_t size,
-                   dma_addr_t *dma_handle, int gfp)
+                   dma_addr_t *dma_handle, gfp_t gfp)
 {
         void *ret;