Merge with /home/shaggy/git/linus-clean/

[linux-2.6-omap-h63xx.git] / drivers / rapidio / rio-scan.c

diff --git a/drivers/rapidio/rio-scan.c b/drivers/rapidio/rio-scan.c
index 4f7ed4bd3be93d2f4870090ec5911e264afde7bd..94e30fe4b8f3242b17f8adc5c1623669d2a513b6 100644 (file)
--- a/drivers/rapidio/rio-scan.c
+++ b/drivers/rapidio/rio-scan.c
@@ -24,6 +24,8 @@
 #include <linux/module.h>
 #include <linux/spinlock.h>
 #include <linux/timer.h>
+#include <linux/jiffies.h>
+#include <linux/slab.h>
 
 #include "rio.h"