diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-02-09 11:19:21 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-09 11:19:21 -0500 |
| commit | 2a074f4a54d11ec0ce16b35e9a88feaa2fd886aa (patch) | |
| tree | b81ab05dac66fa0cccf44896d2d86be7ba52aa49 /include/linux/if_pppox.h | |
| parent | 23c7b521c250b261dd97a7a06d5a2e74b56233d5 (diff) | |
| parent | 8bd4bb7a35e8ebb015a531218614c48e10a3c4ee (diff) | |
Merge branch 'topic/quirk-cleanup' into topic/hda
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 @@ | |||
| 17 | #define __LINUX_IF_PPPOX_H | 17 | #define __LINUX_IF_PPPOX_H |
| 18 | 18 | ||
| 19 | 19 | ||
| 20 | #include <asm/types.h> | 20 | #include <linux/types.h> |
| 21 | #include <asm/byteorder.h> | 21 | #include <asm/byteorder.h> |
| 22 | 22 | ||
| 23 | #ifdef __KERNEL__ | 23 | #ifdef __KERNEL__ |