diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
| commit | 23fd07750a789a66fe88cf173d52a18f1a387da4 (patch) | |
| tree | 06fdd6df35fdb835abdaa9b754d62f6b84b97250 /drivers/pnp/pnpbios/rsparser.c | |
| parent | bd787d438a59266af3c9f6351644c85ef1dd21fe (diff) | |
| parent | ed28f96ac1960f30f818374d65be71d2fdf811b0 (diff) | |
Merge ../linux-2.6 by hand
Diffstat (limited to 'drivers/pnp/pnpbios/rsparser.c')
| -rw-r--r-- | drivers/pnp/pnpbios/rsparser.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pnp/pnpbios/rsparser.c b/drivers/pnp/pnpbios/rsparser.c index b0ca65b68645..5e38cd7335f7 100644 --- a/drivers/pnp/pnpbios/rsparser.c +++ b/drivers/pnp/pnpbios/rsparser.c | |||
| @@ -7,6 +7,8 @@ | |||
| 7 | #include <linux/ctype.h> | 7 | #include <linux/ctype.h> |
| 8 | #include <linux/pnp.h> | 8 | #include <linux/pnp.h> |
| 9 | #include <linux/pnpbios.h> | 9 | #include <linux/pnpbios.h> |
| 10 | #include <linux/string.h> | ||
| 11 | #include <linux/slab.h> | ||
| 10 | 12 | ||
| 11 | #ifdef CONFIG_PCI | 13 | #ifdef CONFIG_PCI |
| 12 | #include <linux/pci.h> | 14 | #include <linux/pci.h> |