diff options
author | 2008-07-26 23:04:59 +0100 | |
---|---|---|
committer | 2008-07-26 23:04:59 +0100 | |
commit | d9ecdb282c91952796b7542c4f57fd6de6948d7b (patch) | |
tree | fd4de7923968afa7d2981fb037e2255fc2cfa1e1 /arch/ia64/hp/common/sba_iommu.c | |
parent | [ARM] fix nwflash.c: 6ee8928d94841aa764aeaf645ad16daff811dc26 (diff) | |
parent | [ARM] update defconfig for eseries. (diff) | |
download | linux-dev-d9ecdb282c91952796b7542c4f57fd6de6948d7b.tar.xz linux-dev-d9ecdb282c91952796b7542c4f57fd6de6948d7b.zip |
Merge branch 'for_rmk_13' of git://git.mnementh.co.uk/linux-2.6-im
Diffstat (limited to 'arch/ia64/hp/common/sba_iommu.c')
-rw-r--r-- | arch/ia64/hp/common/sba_iommu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c index 34421aed1e2a..4956be40d7b5 100644 --- a/arch/ia64/hp/common/sba_iommu.c +++ b/arch/ia64/hp/common/sba_iommu.c @@ -2147,7 +2147,7 @@ sba_dma_supported (struct device *dev, u64 mask) } int -sba_dma_mapping_error (dma_addr_t dma_addr) +sba_dma_mapping_error(struct device *dev, dma_addr_t dma_addr) { return 0; } |