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/bp/bp
[sfrench/cifs-2.6.git]
/
drivers
/
staging
/
memrar
/
memrar_handler.c
diff --git
a/drivers/staging/memrar/memrar_handler.c
b/drivers/staging/memrar/memrar_handler.c
index efa7fd62d3900c642e4281c642ba789ac335035d..41876f2b0e548b1c31ef585110e8501f22019439 100644
(file)
--- a/
drivers/staging/memrar/memrar_handler.c
+++ b/
drivers/staging/memrar/memrar_handler.c
@@
-47,8
+47,7
@@
#include <linux/mm.h>
#include <linux/ioport.h>
#include <linux/io.h>
-
-#include "../rar_register/rar_register.h"
+#include <linux/rar_register.h>
#include "memrar.h"
#include "memrar_allocator.h"