diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-31 00:44:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-31 00:44:06 -0400 |
| commit | 4c15343167b5febe7bb0ba96aad5bef42ae94d3b (patch) | |
| tree | e70f835cc57a6e4b7e18bcb1908217a95a389ba7 /Documentation | |
| parent | eb36c2884a1a2190791afe65fd833b2d3cd4b999 (diff) | |
| parent | d0027bf09f09d95a23b8f476ba8cea28f2576781 (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Fix return value from memcpy
[POWERPC] iseries: Define insw et al. so libata/ide will compile
[POWERPC] Fix irq enable/disable in smp_generic_take_timebase
[POWERPC] Fix problem with time not advancing on 32-bit platforms
[POWERPC] Restore copyright notice in arch/powerpc/kernel/fpu.S
[POWERPC] Fix up ibm_architecture_vec definition
[POWERPC] Make OF irq map code detect more error cases
[POWERPC] Support for "weird" MPICs and fixup mpc7448_hpc2
[POWERPC] Fix MPIC sense codes in documentation
[POWERPC] Fix performance regression in IRQ radix tree locking
[POWERPC] Add mpc7448hpc2 device tree source file
[POWERPC] Add MPC8349E MDS device tree source file to arch/powerpc/boot/dts
[POWERPC] modify mpc83xx platforms to use new IRQ layer
[POWERPC] Adapt ipic driver to new host_ops interface, add set_irq_type to set IRQ sense
[POWERPC] back up old school ipic.[hc] to arch/ppc
[POWERPC] Use mpc8641hpcn PIC base address from dev tree.
[POWERPC] Allow MPC8641 HPCN to build with CONFIG_PCI disabled too.
[POWERPC] Fix powerpc 44x_mmu build
[POWERPC] Remove flush_dcache_all export
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/powerpc/booting-without-of.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/powerpc/booting-without-of.txt b/Documentation/powerpc/booting-without-of.txt index 8c48b8a27b9c..5c0ba235f5a5 100644 --- a/Documentation/powerpc/booting-without-of.txt +++ b/Documentation/powerpc/booting-without-of.txt | |||
| @@ -1136,10 +1136,10 @@ Sense and level information should be encoded as follows: | |||
| 1136 | Devices connected to openPIC-compatible controllers should encode | 1136 | Devices connected to openPIC-compatible controllers should encode |
| 1137 | sense and polarity as follows: | 1137 | sense and polarity as follows: |
| 1138 | 1138 | ||
| 1139 | 0 = high to low edge sensitive type enabled | 1139 | 0 = low to high edge sensitive type enabled |
| 1140 | 1 = active low level sensitive type enabled | 1140 | 1 = active low level sensitive type enabled |
| 1141 | 2 = low to high edge sensitive type enabled | 1141 | 2 = active high level sensitive type enabled |
| 1142 | 3 = active high level sensitive type enabled | 1142 | 3 = high to low edge sensitive type enabled |
| 1143 | 1143 | ||
| 1144 | ISA PIC interrupt controllers should adhere to the ISA PIC | 1144 | ISA PIC interrupt controllers should adhere to the ISA PIC |
| 1145 | encodings listed below: | 1145 | encodings listed below: |