git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel...
[sfrench/cifs-2.6.git]
/
arch
/
powerpc
/
platforms
/
iseries
/
mf.c
diff --git
a/arch/powerpc/platforms/iseries/mf.c
b/arch/powerpc/platforms/iseries/mf.c
index d2c1d497846e75f46f612d9c85043a56cadcbaa9..33e5fc7334fc508be63b52ce6cae473f24726a6c 100644
(file)
--- a/
arch/powerpc/platforms/iseries/mf.c
+++ b/
arch/powerpc/platforms/iseries/mf.c
@@
-30,6
+30,7
@@
#include <linux/init.h>
#include <linux/completion.h>
#include <linux/delay.h>
+#include <linux/proc_fs.h>
#include <linux/dma-mapping.h>
#include <linux/bcd.h>
#include <linux/rtc.h>