summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShuah Khan <shuah.khan@hp.com>2012-10-01 12:48:31 -0600
committerJoerg Roedel <joerg.roedel@amd.com>2012-10-02 12:10:27 +0200
commit759643ce39f13c416236e2609ccaed9792107b2f (patch)
tree46503c499fe4dc51c10abfe0ed1e85fd7903be2f
parenta0d271cbfed1dd50278c6b06bead3d00ba0a88f9 (diff)
downloadlwn-759643ce39f13c416236e2609ccaed9792107b2f.tar.gz
lwn-759643ce39f13c416236e2609ccaed9792107b2f.zip
dma-debug: Remove local BUS_NOTIFY_UNBOUND_DRIVER define
Remove local BUS_NOTIFY_UNBOUND_DRIVER define. This is not used since BUS_NOTIFY_UNBOUND_DRIVER is defined in include/linux/device.h Signed-off-by: Shuah Khan <shuah.khan@hp.com> Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
-rw-r--r--lib/dma-debug.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/lib/dma-debug.c b/lib/dma-debug.c
index 66ce41489133..b9087bff008b 100644
--- a/lib/dma-debug.c
+++ b/lib/dma-debug.c
@@ -120,11 +120,6 @@ static const char *type2name[4] = { "single", "page",
static const char *dir2name[4] = { "DMA_BIDIRECTIONAL", "DMA_TO_DEVICE",
"DMA_FROM_DEVICE", "DMA_NONE" };
-/* little merge helper - remove it after the merge window */
-#ifndef BUS_NOTIFY_UNBOUND_DRIVER
-#define BUS_NOTIFY_UNBOUND_DRIVER 0x0005
-#endif
-
/*
* The access to some variables in this macro is racy. We can't use atomic_t
* here because all these variables are exported to debugfs. Some of them even