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
This commit is contained in:
Linus Torvalds 2011-11-15 14:47:28 -02:00
commit 642ba5ed7a

View file

@ -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>