diff options
| author | Eric Miao <eric.miao@marvell.com> | 2009-03-09 09:21:07 -0400 |
|---|---|---|
| committer | Eric Miao <eric.miao@marvell.com> | 2009-03-09 09:21:07 -0400 |
| commit | abcea2c322cef559ef2f108b4763d107a5ccc37f (patch) | |
| tree | 5fec7fec372f9bdb70703f6c77bfc49cda945442 /include/linux/nubus.h | |
| parent | 8118aea23c328fd4913b325af53fda9d530b1d56 (diff) | |
| parent | 6d831c6554e4f95083919914955a1a3a4a6acfa9 (diff) | |
Merge branch 'devel' of ssh://master.kernel.org/home/rmk/linux-2.6-arm into devel
Diffstat (limited to 'include/linux/nubus.h')
| -rw-r--r-- | include/linux/nubus.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/nubus.h b/include/linux/nubus.h index c4355076d1a5..7382af374731 100644 --- a/include/linux/nubus.h +++ b/include/linux/nubus.h | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #ifndef LINUX_NUBUS_H | 12 | #ifndef LINUX_NUBUS_H |
| 13 | #define LINUX_NUBUS_H | 13 | #define LINUX_NUBUS_H |
| 14 | 14 | ||
| 15 | #include <linux/types.h> | ||
| 15 | #ifdef __KERNEL__ | 16 | #ifdef __KERNEL__ |
| 16 | #include <asm/nubus.h> | 17 | #include <asm/nubus.h> |
| 17 | #endif | 18 | #endif |