diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-12-23 02:41:14 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-12-23 02:41:14 -0500 |
| commit | cfb13c5db08c90311a5defdde9a0328ee788cca5 (patch) | |
| tree | 842cb60d1d19b99e550fdbc653723e4b13e51ee5 /drivers/pnp/isapnp/proc.c | |
| parent | 4b6ba8aacbb3185703b797286547d0f8f3859b02 (diff) | |
| parent | 90a8a73c06cc32b609a880d48449d7083327e11a (diff) | |
Merge commit 'v2.6.37-rc7' into devicetree/next
Diffstat (limited to 'drivers/pnp/isapnp/proc.c')
| -rw-r--r-- | drivers/pnp/isapnp/proc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pnp/isapnp/proc.c b/drivers/pnp/isapnp/proc.c index e73ebefdf3e0..315b3112aca8 100644 --- a/drivers/pnp/isapnp/proc.c +++ b/drivers/pnp/isapnp/proc.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | #include <linux/isapnp.h> | 21 | #include <linux/isapnp.h> |
| 22 | #include <linux/proc_fs.h> | 22 | #include <linux/proc_fs.h> |
| 23 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 24 | #include <linux/smp_lock.h> | ||
| 25 | #include <asm/uaccess.h> | 24 | #include <asm/uaccess.h> |
| 26 | 25 | ||
| 27 | extern struct pnp_protocol isapnp_protocol; | 26 | extern struct pnp_protocol isapnp_protocol; |