diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-04-21 12:52:36 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-04-21 12:52:36 -0400 |
| commit | a748422ee45725e04e1d3792fa19dfa90ddfd116 (patch) | |
| tree | 978e12895468baaa9f7ab2747b9f7d50beaf1717 /include/linux/mv643xx.h | |
| parent | c63e31c2cc1ec67372920b5e1aff8204d04dd172 (diff) | |
| parent | f4ffaa452e71495a06376f12f772342bc57051fc (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/linux/mv643xx.h')
| -rw-r--r-- | include/linux/mv643xx.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mv643xx.h b/include/linux/mv643xx.h index 955d3069d727..edfa012fad3a 100644 --- a/include/linux/mv643xx.h +++ b/include/linux/mv643xx.h | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | #ifndef __ASM_MV643XX_H | 13 | #ifndef __ASM_MV643XX_H |
| 14 | #define __ASM_MV643XX_H | 14 | #define __ASM_MV643XX_H |
| 15 | 15 | ||
| 16 | #ifdef __MIPS__ | 16 | #ifdef __mips__ |
| 17 | #include <asm/addrspace.h> | 17 | #include <asm/addrspace.h> |
| 18 | #include <asm/marvell.h> | 18 | #include <asm/marvell.h> |
| 19 | #endif | 19 | #endif |