aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pnp/interface.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-12-01 18:02:17 +0100
committerTakashi Iwai <tiwai@suse.de>2008-12-01 18:02:17 +0100
commit3af4182cc5be7d5505f9801ee3297373f1872446 (patch)
tree214348d40ed547a72f9612a7e5c94a01afded812 /drivers/pnp/interface.c
parentf5d4c67e41a262f0cdfaec1bb0fa8e5952187ef9 (diff)
parentc07f62e5f18123103459ff74e86af1518a5b8af5 (diff)
downloadkernel_samsung_crespo-3af4182cc5be7d5505f9801ee3297373f1872446.zip
kernel_samsung_crespo-3af4182cc5be7d5505f9801ee3297373f1872446.tar.gz
kernel_samsung_crespo-3af4182cc5be7d5505f9801ee3297373f1872446.tar.bz2
Merge branch 'upstream' into topic/asoc
Diffstat (limited to 'drivers/pnp/interface.c')
-rw-r--r--drivers/pnp/interface.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pnp/interface.c b/drivers/pnp/interface.c
index 478a4a7..c3f1c8e 100644
--- a/drivers/pnp/interface.c
+++ b/drivers/pnp/interface.c
@@ -12,7 +12,6 @@
#include <linux/errno.h>
#include <linux/list.h>
#include <linux/types.h>
-#include <linux/pnp.h>
#include <linux/stat.h>
#include <linux/ctype.h>
#include <linux/slab.h>