diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2007-02-10 07:26:32 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-02-10 07:26:32 +0100 |
| commit | b22364c8eec89e6b0c081a237f3b6348df87796f (patch) | |
| tree | 233a923281fb640106465d076997ff511efb6edf /include/asm-um/bug.h | |
| parent | Input: ads7846 - be more compatible with the hwmon framework (diff) | |
| parent | libata: kill ATA_ENABLE_PATA (diff) | |
| download | linux-b22364c8eec89e6b0c081a237f3b6348df87796f.tar.xz linux-b22364c8eec89e6b0c081a237f3b6348df87796f.zip | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-um/bug.h')
| -rw-r--r-- | include/asm-um/bug.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-um/bug.h b/include/asm-um/bug.h index 1e22fa26ff06..3357c5e2468e 100644 --- a/include/asm-um/bug.h +++ b/include/asm-um/bug.h @@ -1,4 +1,6 @@ #ifndef __UM_BUG_H #define __UM_BUG_H -#include <asm-generic/bug.h> + +#include <asm/arch/bug.h> + #endif |