diff options
Diffstat (limited to 'lib/dma-debug.c')
-rw-r--r-- | lib/dma-debug.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/lib/dma-debug.c b/lib/dma-debug.c index 66ce4148913..b9087bff008 100644 --- a/lib/dma-debug.c +++ b/lib/dma-debug.c | |||
@@ -120,11 +120,6 @@ static const char *type2name[4] = { "single", "page", | |||
120 | static const char *dir2name[4] = { "DMA_BIDIRECTIONAL", "DMA_TO_DEVICE", | 120 | static const char *dir2name[4] = { "DMA_BIDIRECTIONAL", "DMA_TO_DEVICE", |
121 | "DMA_FROM_DEVICE", "DMA_NONE" }; | 121 | "DMA_FROM_DEVICE", "DMA_NONE" }; |
122 | 122 | ||
123 | /* little merge helper - remove it after the merge window */ | ||
124 | #ifndef BUS_NOTIFY_UNBOUND_DRIVER | ||
125 | #define BUS_NOTIFY_UNBOUND_DRIVER 0x0005 | ||
126 | #endif | ||
127 | |||
128 | /* | 123 | /* |
129 | * The access to some variables in this macro is racy. We can't use atomic_t | 124 | * The access to some variables in this macro is racy. We can't use atomic_t |
130 | * here because all these variables are exported to debugfs. Some of them even | 125 | * here because all these variables are exported to debugfs. Some of them even |