diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-04 18:09:44 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-04 18:09:44 -0400 |
| commit | 6fdf5e67fe8d3c83500dad9acae985132c2459a3 (patch) | |
| tree | c6cb9c0b22c4d22e4c65a40c0851aff5eedf7cd5 /include | |
| parent | abd24df828f1a72971db29d1b74fefae104ea9e2 (diff) | |
| parent | e64a3cfcd929d093a2f076bcace9afa7ba5a2e32 (diff) | |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/ralf/upstream-linus
* 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/ralf/upstream-linus:
[MIPS] Make KGDB compile on UP
[MIPS] Pb1200: Fix header breakage
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-mips/mach-pb1x00/pb1200.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mips/mach-pb1x00/pb1200.h b/include/asm-mips/mach-pb1x00/pb1200.h index ed5fd7390678..72213e3d02c7 100644 --- a/include/asm-mips/mach-pb1x00/pb1200.h +++ b/include/asm-mips/mach-pb1x00/pb1200.h | |||
| @@ -245,7 +245,7 @@ enum external_pb1200_ints { | |||
| 245 | PB1200_SD1_INSERT_INT, | 245 | PB1200_SD1_INSERT_INT, |
| 246 | PB1200_SD1_EJECT_INT, | 246 | PB1200_SD1_EJECT_INT, |
| 247 | 247 | ||
| 248 | PB1200_INT_END (PB1200_INT_BEGIN + 15) | 248 | PB1200_INT_END = PB1200_INT_BEGIN + 15 |
| 249 | }; | 249 | }; |
| 250 | 250 | ||
| 251 | /* For drivers/pcmcia/au1000_db1x00.c */ | 251 | /* For drivers/pcmcia/au1000_db1x00.c */ |