diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 18:14:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 18:14:02 -0800 |
| commit | 236e6127ad942fa9712f83a2d441e0ba7c3fc190 (patch) | |
| tree | c57f86b605bcd3b1c08d28a8de945cca83e4152b /include/asm-cris/axisflashmap.h | |
| parent | 7216d3e927c3b6c5d28e5ffaa54afbb34649debb (diff) | |
v2.4.4 -> v2.4.4.1
- Al Viro: clean up driver "invalidate_device()" mess
- Andries Brouwer: make sd.c work with USB Dane-Elec CompactFlash Card
Reader
- me: fix nasty lazy kernel page table update problem
- me: undo fork changes. Too many user-level bugs and unresolved issues.
- Peter Anvin: iso9660 cleanups
- Alan Cox: big merge
- Johannes Erdfelt: UHCI pci DMA setup fix
Diffstat (limited to 'include/asm-cris/axisflashmap.h')
| -rw-r--r-- | include/asm-cris/axisflashmap.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-cris/axisflashmap.h b/include/asm-cris/axisflashmap.h index a3438501d8a2..56cb1494a87b 100644 --- a/include/asm-cris/axisflashmap.h +++ b/include/asm-cris/axisflashmap.h @@ -15,7 +15,7 @@ * tools/mkptable is used to generate the ptable. */ -/* The partition table start with kod to "jump over" it: */ +/* The partition table starts with code to "jump over" it: */ #define PARTITIONTABLE_CODE_START { \ 0x0f, 0x05, /* nop 0 */\ 0x25, 0xf0, /* di 2 */\ @@ -24,7 +24,7 @@ /* The actual offset depend on the number of entries */ #define PARTITIONTABLE_CODE_END { \ 0x00, 0x00, /* ba offset 6 */\ - 0x0f, 0x0f /* nop 8 */} + 0x0f, 0x05 /* nop 8 */} #define PARTITION_TABLE_OFFSET 10 #define PARTITION_TABLE_MAGIC 0xbeef /* Not a good magic */ |