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/bioscalls.c | |
parent | 96916090f488986a4ebb8e9ffa6a3b50881d5ccd (diff) | |
parent | dfd2e1b4e6eb46ff59c7e1c1111c967b8b5981c1 (diff) |
Merge branch 'pnp' into release
Diffstat (limited to 'drivers/pnp/pnpbios/bioscalls.c')
-rw-r--r-- | drivers/pnp/pnpbios/bioscalls.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c index a8364d815222..7ff824496b39 100644 --- a/drivers/pnp/pnpbios/bioscalls.c +++ b/drivers/pnp/pnpbios/bioscalls.c | |||
@@ -7,7 +7,6 @@ | |||
7 | #include <linux/init.h> | 7 | #include <linux/init.h> |
8 | #include <linux/linkage.h> | 8 | #include <linux/linkage.h> |
9 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
10 | #include <linux/pnpbios.h> | ||
11 | #include <linux/device.h> | 10 | #include <linux/device.h> |
12 | #include <linux/pnp.h> | 11 | #include <linux/pnp.h> |
13 | #include <linux/mm.h> | 12 | #include <linux/mm.h> |