diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:37:58 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:37:58 -0400 |
| commit | 5a2cec83a9bb1b4295aa8ab728fcb8ca1811a33c (patch) | |
| tree | 2f83dc6949763e77cf6422e696dc6146684dcf4e /drivers/pnp/card.c | |
| parent | f2c853bca542f5ac0b036377637192a74f2091c2 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/pnp/card.c')
| -rw-r--r-- | drivers/pnp/card.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/pnp/card.c b/drivers/pnp/card.c index 6e5229e92fbc..e95ed67d4f05 100644 --- a/drivers/pnp/card.c +++ b/drivers/pnp/card.c | |||
| @@ -8,13 +8,6 @@ | |||
| 8 | #include <linux/config.h> | 8 | #include <linux/config.h> |
| 9 | #include <linux/module.h> | 9 | #include <linux/module.h> |
| 10 | #include <linux/slab.h> | 10 | #include <linux/slab.h> |
| 11 | |||
| 12 | #ifdef CONFIG_PNP_DEBUG | ||
| 13 | #define DEBUG | ||
| 14 | #else | ||
| 15 | #undef DEBUG | ||
| 16 | #endif | ||
| 17 | |||
| 18 | #include <linux/pnp.h> | 11 | #include <linux/pnp.h> |
| 19 | #include "base.h" | 12 | #include "base.h" |
| 20 | 13 | ||