From 9e154b3206b2d970cb8f1ed9fd82ef61974e547b Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Fri, 5 Jun 2009 09:26:41 +0200 Subject: [PATCH] --- yaml --- r: 148366 b: refs/heads/master c: 6d74b86d3c0f9cfa949566a862aaad840e393249 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/pci/ctxfi/cthw20k1.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5acbc48d0a27..79da80b9c5eb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bd05dbd3b22612455283610b4e006ee3e421b13d +refs/heads/master: 6d74b86d3c0f9cfa949566a862aaad840e393249 diff --git a/trunk/sound/pci/ctxfi/cthw20k1.c b/trunk/sound/pci/ctxfi/cthw20k1.c index b7b8e6f41d0d..1da1f82fe812 100644 --- a/trunk/sound/pci/ctxfi/cthw20k1.c +++ b/trunk/sound/pci/ctxfi/cthw20k1.c @@ -15,8 +15,6 @@ * */ -#include "cthw20k1.h" -#include "ct20k1reg.h" #include #include #include @@ -26,8 +24,14 @@ #include #include #include +#include "cthw20k1.h" +#include "ct20k1reg.h" -#define CT_XFI_DMA_MASK DMA_BIT_MASK(32) /* 32 bits */ +#if BITS_PER_LONG == 32 +#define CT_XFI_DMA_MASK DMA_BIT_MASK(32) /* 32 bit PTE */ +#else +#define CT_XFI_DMA_MASK DMA_BIT_MASK(64) /* 64 bit PTE */ +#endif struct hw20k1 { struct hw hw;