From: Shuah Khan Date: Mon, 1 Oct 2012 18:48:31 +0000 (-0600) Subject: dma-debug: Remove local BUS_NOTIFY_UNBOUND_DRIVER define X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=759643ce39f13c416236e2609ccaed9792107b2f;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git 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 Signed-off-by: Joerg Roedel --- 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