summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJens Axboe <jaxboe@fusionio.com>2010-08-03 13:22:51 +0200
committerJens Axboe <jaxboe@fusionio.com>2010-08-07 18:53:13 +0200
commit4aeefdc69f7b6f3f287e6fd8d4b213953b9e92d8 (patch)
tree97564b5639b65e5b1c475a50b9676c0468a18253 /include
parent7cc015811ef8992dfcce314d0ed9642bc18143d1 (diff)
downloadlinux-4aeefdc69f7b6f3f287e6fd8d4b213953b9e92d8.tar.gz
linux-4aeefdc69f7b6f3f287e6fd8d4b213953b9e92d8.tar.bz2
linux-4aeefdc69f7b6f3f287e6fd8d4b213953b9e92d8.zip
coda: fixup clash with block layer REQ_* defines
CODA should not be using defines in the global name space of that nature, prefix them with CODA_. Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/coda_psdev.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/coda_psdev.h b/include/linux/coda_psdev.h
index 8859e2ede9fe..284b520934a0 100644
--- a/include/linux/coda_psdev.h
+++ b/include/linux/coda_psdev.h
@@ -86,9 +86,9 @@ struct upc_req {
wait_queue_head_t uc_sleep; /* process' wait queue */
};
-#define REQ_ASYNC 0x1
-#define REQ_READ 0x2
-#define REQ_WRITE 0x4
-#define REQ_ABORT 0x8
+#define CODA_REQ_ASYNC 0x1
+#define CODA_REQ_READ 0x2
+#define CODA_REQ_WRITE 0x4
+#define CODA_REQ_ABORT 0x8
#endif