diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-01-25 11:54:33 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-01-25 11:54:33 +0100 |
| commit | 5b74f9e0e005baf12a2df6aaeef7d7134137792b (patch) | |
| tree | d3cef2c8c91fb415533e028bf55cc348d8818431 /include/linux/if_pppox.h | |
| parent | e3ee1e123183ca9847e74b7b8e2694c9e3b817a6 (diff) | |
| parent | f3b8436ad9a8ad36b3c9fa1fe030c7f38e5d3d0b (diff) | |
Merge branch 'linus' into timers/hrtimers
Diffstat (limited to 'include/linux/if_pppox.h')
| -rw-r--r-- | include/linux/if_pppox.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h index 6fb7f1788570..30c88b2245ff 100644 --- a/include/linux/if_pppox.h +++ b/include/linux/if_pppox.h @@ -17,7 +17,7 @@ #define __LINUX_IF_PPPOX_H -#include <asm/types.h> +#include <linux/types.h> #include <asm/byteorder.h> #ifdef __KERNEL__ |