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 <[email protected]>
---
lib/dma-debug.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/lib/dma-debug.c b/lib/dma-debug.c
index 66ce414..b9087bf 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
--
1.7.9.5
On Mon, Oct 01, 2012 at 12:48:31PM -0600, Shuah Khan wrote:
> 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 <[email protected]>
> ---
> lib/dma-debug.c | 5 -----
> 1 file changed, 5 deletions(-)
>
> diff --git a/lib/dma-debug.c b/lib/dma-debug.c
> index 66ce414..b9087bf 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
> -
Thanks, applied.
--
AMD Operating System Research Center
Advanced Micro Devices GmbH Einsteinring 24 85609 Dornach
General Managers: Alberto Bozzo
Registration: Dornach, Landkr. Muenchen; Registerger. Muenchen, HRB Nr. 43632