git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
drivers
/
pnp
/
manager.c
diff --git
a/drivers/pnp/manager.c
b/drivers/pnp/manager.c
index
00fd357
..
0a15664
100644
(file)
--- a/
drivers/pnp/manager.c
+++ b/
drivers/pnp/manager.c
@@
-12,7
+12,6
@@
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/pnp.h>
-#include <linux/slab.h>
#include <linux/bitmap.h>
#include <linux/mutex.h>
#include "base.h"