Merge branch 'omap-pool'

[linux-2.6-omap-h63xx.git] / drivers / scsi / sym53c8xx_2 / sym_malloc.c

diff --git a/drivers/scsi/sym53c8xx_2/sym_malloc.c b/drivers/scsi/sym53c8xx_2/sym_malloc.c
index 92bf9b14a7a2bb98fdd0cc772d7496f86dc77637..883cac10daf9b15a129549b3fecd73aa871f6af2 100644 (file)
--- a/drivers/scsi/sym53c8xx_2/sym_malloc.c
+++ b/drivers/scsi/sym53c8xx_2/sym_malloc.c
@@ -262,7 +262,7 @@ static void ___free_dma_mem_cluster(m_pool_p mp, void *m)
 #endif
 
 /* Fetch the memory pool for a given pool id (i.e. DMA constraints) */
-static __inline m_pool_p ___get_dma_pool(m_pool_ident_t dev_dmat)
+static inline m_pool_p ___get_dma_pool(m_pool_ident_t dev_dmat)
 {
        m_pool_p mp;
        for (mp = mp0.next;