diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-02-10 14:45:43 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-02-10 14:45:43 -0500 |
| commit | 81b7bbd1932a04869d4c8635a75222dfc6089f96 (patch) | |
| tree | 285ae868a1e3a41fb0dbfe346c28e380949bcb55 /include/linux/atmarp.h | |
| parent | 98051995ab44b993f992946055edc6115351f725 (diff) | |
| parent | 66efc5a7e3061c3597ac43a8bb1026488d57e66b (diff) | |
Merge branch 'linus'
Conflicts:
drivers/scsi/ipr.c
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'include/linux/atmarp.h')
| -rw-r--r-- | include/linux/atmarp.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/atmarp.h b/include/linux/atmarp.h index ee108f9e9cb7..231f4bdec730 100644 --- a/include/linux/atmarp.h +++ b/include/linux/atmarp.h | |||
| @@ -6,9 +6,7 @@ | |||
| 6 | #ifndef _LINUX_ATMARP_H | 6 | #ifndef _LINUX_ATMARP_H |
| 7 | #define _LINUX_ATMARP_H | 7 | #define _LINUX_ATMARP_H |
| 8 | 8 | ||
| 9 | #ifdef __KERNEL__ | ||
| 10 | #include <linux/types.h> | 9 | #include <linux/types.h> |
| 11 | #endif | ||
| 12 | #include <linux/atmapi.h> | 10 | #include <linux/atmapi.h> |
| 13 | #include <linux/atmioc.h> | 11 | #include <linux/atmioc.h> |
| 14 | 12 | ||