diff --git a/[refs] b/[refs] index 921b8fac6945..37ea2ccad013 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7b2ee291fbd3dbe8079c67fec6382a8ed6c275f7 +refs/heads/master: 019d80db5727707faa2108fcd4fbbfac9defb3a6 diff --git a/trunk/include/sound/memalloc.h b/trunk/include/sound/memalloc.h index 844af65af626..cf15b8213df7 100644 --- a/trunk/include/sound/memalloc.h +++ b/trunk/include/sound/memalloc.h @@ -37,7 +37,7 @@ struct snd_dma_device { #ifndef snd_dma_pci_data #define snd_dma_pci_data(pci) (&(pci)->dev) #define snd_dma_isa_data() NULL -#define snd_dma_continuous_data(x) ((struct device *)(unsigned long)(x)) +#define snd_dma_continuous_data(x) ((struct device *)(__force unsigned long)(x)) #endif