Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e139aa59 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Linus Torvalds
Browse files

[PATCH] PNP: make pnp_dbg conditional directly on CONFIG_PNP_DEBUG 



Seems pointless to require .c files to test CONFIG_PNP_DEBUG and
conditionally define DEBUG before including <linux/pnp.h>.  Just test
CONFIG_PNP_DEBUG directly in pnp.h.

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Adam Belay <ambx1@neo.rr.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 486d46ae

drivers/pnp/card.c

+0 −7
Original line number Diff line number Diff line
@@ -8,13 +8,6 @@ 
#include <linux/config.h>

#include <linux/module.h>

#include <linux/slab.h>



#ifdef CONFIG_PNP_DEBUG

	#define DEBUG

#else

	#undef DEBUG

#endif



#include <linux/pnp.h>

#include "base.h"

drivers/pnp/driver.c

+0 −7
Original line number Diff line number Diff line
@@ -11,13 +11,6 @@ 
#include <linux/module.h>

#include <linux/ctype.h>

#include <linux/slab.h>



#ifdef CONFIG_PNP_DEBUG

	#define DEBUG

#else

	#undef DEBUG

#endif



#include <linux/pnp.h>

#include "base.h"

drivers/pnp/manager.c

+0 −7
Original line number Diff line number Diff line
@@ -11,13 +11,6 @@ 
#include <linux/module.h>

#include <linux/init.h>

#include <linux/kernel.h>



#ifdef CONFIG_PNP_DEBUG

	#define DEBUG

#else

	#undef DEBUG

#endif



#include <linux/pnp.h>

#include "base.h"

drivers/pnp/pnpacpi/core.c

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 */

 

#include <linux/config.h>

#include <linux/acpi.h>

#include <linux/pnp.h>

#include <acpi/acpi_bus.h>

drivers/pnp/quirks.c

+0 −7
Original line number Diff line number Diff line
@@ -16,13 +16,6 @@ 
#include <linux/kernel.h>

#include <linux/string.h>

#include <linux/slab.h>



#ifdef CONFIG_PNP_DEBUG

	#define DEBUG

#else

	#undef DEBUG

#endif



#include <linux/pnp.h>

#include "base.h"