diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-12-23 08:48:41 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-12-23 08:48:41 (GMT) |
| commit | 26e20a108caca6231c6a5ec659f815a866904751 (patch) | |
| tree | 36932c208a9e8994bfd7ed4eaf48b9c33f71fbe3 /drivers/pnp/isapnp/proc.c | |
| parent | 691513f70d3957939a318da970987b876c720861 (diff) | |
| parent | 90a8a73c06cc32b609a880d48449d7083327e11a (diff) | |
| download | linux-fsl-qoriq-26e20a108caca6231c6a5ec659f815a866904751.tar.xz | |
Merge commit 'v2.6.37-rc7' into x86/security
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 e73ebef..315b311 100644 --- a/drivers/pnp/isapnp/proc.c +++ b/drivers/pnp/isapnp/proc.c @@ -21,7 +21,6 @@ #include <linux/isapnp.h> #include <linux/proc_fs.h> #include <linux/init.h> -#include <linux/smp_lock.h> #include <asm/uaccess.h> extern struct pnp_protocol isapnp_protocol; |