diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /arch/m68k/include/asm/mac_oss.h | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'arch/m68k/include/asm/mac_oss.h')
| -rw-r--r-- | arch/m68k/include/asm/mac_oss.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/mac_oss.h b/arch/m68k/include/asm/mac_oss.h index 7221f725193..3cf2b6ed685 100644 --- a/arch/m68k/include/asm/mac_oss.h +++ b/arch/m68k/include/asm/mac_oss.h | |||
| @@ -61,7 +61,7 @@ | |||
| 61 | /* | 61 | /* |
| 62 | * OSS Interrupt levels for various sub-systems | 62 | * OSS Interrupt levels for various sub-systems |
| 63 | * | 63 | * |
| 64 | * This mapping is layed out with two things in mind: first, we try to keep | 64 | * This mapping is laid out with two things in mind: first, we try to keep |
| 65 | * things on their own levels to avoid having to do double-dispatches. Second, | 65 | * things on their own levels to avoid having to do double-dispatches. Second, |
| 66 | * the levels match as closely as possible the alternate IRQ mapping mode (aka | 66 | * the levels match as closely as possible the alternate IRQ mapping mode (aka |
| 67 | * "A/UX mode") available on some VIA machines. | 67 | * "A/UX mode") available on some VIA machines. |