lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge ../bleed-2.6

Browse Source
This commit is contained in:
Greg KH
2005-10-28 10:13:16 -07:00
committed by Greg Kroah-Hartman
parent 1a222bca26 27d1097d39
commit 6fbfddcb52
591 changed files with 23717 additions and 10531 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/i2o.h
View File

@@ -490,7 +490,7 @@ static inline int i2o_dma_map_sg(struct i2o_controller *c,
* Returns 0 on success or -ENOMEM on failure.
*/
static inline int i2o_dma_alloc(struct device *dev, struct i2o_dma *addr,
size_t len, unsigned int gfp_mask)
size_t len, gfp_t gfp_mask)
{
struct pci_dev *pdev = to_pci_dev(dev);
int dma_64 = 0;
@@ -549,7 +549,7 @@ static inline void i2o_dma_free(struct device *dev, struct i2o_dma *addr)
* Returns the 0 on success or negative error code on failure.
*/
static inline int i2o_dma_realloc(struct device *dev, struct i2o_dma *addr,
size_t len, unsigned int gfp_mask)
size_t len, gfp_t gfp_mask)
{
i2o_dma_free(dev, addr);