diff options
| author | Len Brown <len.brown@intel.com> | 2008-04-30 13:59:05 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-04-30 13:59:05 -0400 |
| commit | 008238b54ac2350babf195084ecedbcf7851a202 (patch) | |
| tree | a7cc18ea0403f4478883a3e36a6f0d2bf67eef3e /drivers/pnp/pnpbios/proc.c | |
| parent | 96916090f488986a4ebb8e9ffa6a3b50881d5ccd (diff) | |
| parent | dfd2e1b4e6eb46ff59c7e1c1111c967b8b5981c1 (diff) | |
Merge branch 'pnp' into release
Diffstat (limited to 'drivers/pnp/pnpbios/proc.c')
| -rw-r--r-- | drivers/pnp/pnpbios/proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pnp/pnpbios/proc.c b/drivers/pnp/pnpbios/proc.c index bb19bc957bad..4f89f1677e69 100644 --- a/drivers/pnp/pnpbios/proc.c +++ b/drivers/pnp/pnpbios/proc.c | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | #include <linux/slab.h> | 23 | #include <linux/slab.h> |
| 24 | #include <linux/types.h> | 24 | #include <linux/types.h> |
| 25 | #include <linux/proc_fs.h> | 25 | #include <linux/proc_fs.h> |
| 26 | #include <linux/pnpbios.h> | 26 | #include <linux/pnp.h> |
| 27 | #include <linux/init.h> | 27 | #include <linux/init.h> |
| 28 | 28 | ||
| 29 | #include <asm/uaccess.h> | 29 | #include <asm/uaccess.h> |