diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-02 16:08:56 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-02 16:08:56 -0500 |
| commit | c02368a9d059322f913a58111eade87a656fefd5 (patch) | |
| tree | 2f02dbbe69b86535f58d2010d9adfb20a9c16fb9 /include/linux/nubus.h | |
| parent | f17c75453b2d195eba0a90d9f16a3ba88c85b3b4 (diff) | |
| parent | 778ef1e6cbb049c9bcbf405936ee6f2b6e451892 (diff) | |
Merge branch 'linus' into irq/genirq
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 |