diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-18 19:44:17 +0300 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-18 19:44:17 +0300 |
| commit | f333b3f111e9db76109e304df8ee777ace7fbf86 (patch) | |
| tree | ce9a74a7327020c48c80d278e1db5f12552f0fb0 /drivers/net/irda | |
| parent | f4256e301d9800b1e0276404cb01b3ac85b51067 (diff) | |
| parent | 79bfb0a98fdc73ed6a18469cef245cbf50a1d8bb (diff) | |
| download | linux-f333b3f111e9db76109e304df8ee777ace7fbf86.tar.xz | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/net/irda')
| -rw-r--r-- | drivers/net/irda/ali-ircc.c | 1 | ||||
| -rw-r--r-- | drivers/net/irda/nsc-ircc.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/irda/ali-ircc.c b/drivers/net/irda/ali-ircc.c index 9bf34681d3df..2e7882eb7d6f 100644 --- a/drivers/net/irda/ali-ircc.c +++ b/drivers/net/irda/ali-ircc.c @@ -40,6 +40,7 @@ #include <asm/byteorder.h> #include <linux/pm.h> +#include <linux/pm_legacy.h> #include <net/irda/wrapper.h> #include <net/irda/irda.h> diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c index 805714ec9a8a..ee717d0e939e 100644 --- a/drivers/net/irda/nsc-ircc.c +++ b/drivers/net/irda/nsc-ircc.c @@ -59,6 +59,7 @@ #include <asm/byteorder.h> #include <linux/pm.h> +#include <linux/pm_legacy.h> #include <net/irda/wrapper.h> #include <net/irda/irda.h> |