diff --git a/[refs] b/[refs] index 0f8092373ade..78fed66d56fd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 596f17f901dbc645883cf663c26ef2c80b5db5a4 +refs/heads/master: 2105b9a11fbf92a4bf16ced4dba7f59a110932b2 diff --git a/trunk/arch/arm/mach-bcmring/dma.c b/trunk/arch/arm/mach-bcmring/dma.c index 1a1a27dd5654..8751582a6cb1 100644 --- a/trunk/arch/arm/mach-bcmring/dma.c +++ b/trunk/arch/arm/mach-bcmring/dma.c @@ -36,7 +36,6 @@ #include #include #include -#include #include /* I don't quite understand why dc4 fails when this is set to 1 and DMA is enabled */