Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 642ba5ed authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux:
  fsl-rio: fix compile error
parents 80f01ca1 e0ce42e1

arch/powerpc/sysdev/fsl_rio.c

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
 */



#include <linux/init.h>

#include <linux/export.h>

#include <linux/module.h>

#include <linux/types.h>

#include <linux/dma-mapping.h>

#include <linux/interrupt.h>