projects
/
nbd-module.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7c063de
)
Out of tree builds use local include file
author
Alex Bligh <alex@alex.org.uk>
Wed, 18 May 2011 07:42:57 +0000
(08:42 +0100)
committer
Alex Bligh <alex@alex.org.uk>
Wed, 18 May 2011 07:42:57 +0000
(08:42 +0100)
Makefile
patch
|
blob
|
history
nbd.c
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
10f82f8
..
f4e3cd8
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,6
+1,7
@@
ifneq ($(KERNELRELEASE),)
# kbuild part of makefile
ifneq ($(KERNELRELEASE),)
# kbuild part of makefile
-obj-m := nbd.o
+obj-m := nbd.o
+ccflags-y := -DNBD_OUTOFTREE
else
else
diff --git
a/nbd.c
b/nbd.c
index
e6fc716
..
0eeed20
100644
(file)
--- a/
nbd.c
+++ b/
nbd.c
@@
-37,7
+37,11
@@
#include <asm/system.h>
#include <asm/types.h>
#include <asm/system.h>
#include <asm/types.h>
+#ifdef NBD_OUTOFTREE
+#include "nbd.h"
+#else
#include <linux/nbd.h>
#include <linux/nbd.h>
+#endif
#define LO_MAGIC 0x68797548
#define LO_MAGIC 0x68797548