diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 20:38:55 +0100 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 20:38:55 +0100 |
| commit | 328198acb7407301ddf6005c0fa1e04bd0c539c8 (patch) | |
| tree | 9936112bd195bfbaacc9a75f2ea7ff757a2c0546 /drivers/pnp/manager.c | |
| parent | Merge branch 'master' (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6 (diff) | |
| download | linux-328198acb7407301ddf6005c0fa1e04bd0c539c8.tar.xz linux-328198acb7407301ddf6005c0fa1e04bd0c539c8.zip | |
Merge branch 'master'
Diffstat (limited to 'drivers/pnp/manager.c')
| -rw-r--r-- | drivers/pnp/manager.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pnp/manager.c b/drivers/pnp/manager.c index 94442ffd4aed..cbb2749db178 100644 --- a/drivers/pnp/manager.c +++ b/drivers/pnp/manager.c @@ -12,6 +12,8 @@ #include <linux/init.h> #include <linux/kernel.h> #include <linux/pnp.h> +#include <linux/slab.h> +#include <linux/bitmap.h> #include "base.h" DECLARE_MUTEX(pnp_res_mutex); |