diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-26 15:06:08 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-26 15:06:08 -0500 |
| commit | c90c69a508c2fd8d2f892c4b166baffc91111117 (patch) | |
| tree | fbda802935ab4dfc56a7dc758c787fce4c066c02 /Documentation | |
| parent | 6842ac64ae2ed2714004a25d53d3b20f0d3af524 (diff) | |
| parent | 19ba1b19962aeb87a029b37234f54b02e8f7b507 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC] uctrl: Check request_irq() return value.
[SPARC64]: Update defconfig.
[SPARC64] bbc_i2c: Fix kenvctrld eating %100 cpu.
[SPARC64]: Fix arch_teardown_msi_irq().
[SPARC64]: virt_irq_free only needed when CONFIG_PCI_MSI
[SPARC]: Remove the broken SUN_AURORA driver.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/magic-number.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Documentation/magic-number.txt b/Documentation/magic-number.txt index af67faccf4de..0e740c812d12 100644 --- a/Documentation/magic-number.txt +++ b/Documentation/magic-number.txt | |||
| @@ -65,7 +65,6 @@ CMAGIC 0x0111 user include/linux/a.out.h | |||
| 65 | MKISS_DRIVER_MAGIC 0x04bf mkiss_channel drivers/net/mkiss.h | 65 | MKISS_DRIVER_MAGIC 0x04bf mkiss_channel drivers/net/mkiss.h |
| 66 | RISCOM8_MAGIC 0x0907 riscom_port drivers/char/riscom8.h | 66 | RISCOM8_MAGIC 0x0907 riscom_port drivers/char/riscom8.h |
| 67 | SPECIALIX_MAGIC 0x0907 specialix_port drivers/char/specialix_io8.h | 67 | SPECIALIX_MAGIC 0x0907 specialix_port drivers/char/specialix_io8.h |
| 68 | AURORA_MAGIC 0x0A18 Aurora_port drivers/sbus/char/aurora.h | ||
| 69 | HDLC_MAGIC 0x239e n_hdlc drivers/char/n_hdlc.c | 68 | HDLC_MAGIC 0x239e n_hdlc drivers/char/n_hdlc.c |
| 70 | APM_BIOS_MAGIC 0x4101 apm_user arch/i386/kernel/apm.c | 69 | APM_BIOS_MAGIC 0x4101 apm_user arch/i386/kernel/apm.c |
| 71 | CYCLADES_MAGIC 0x4359 cyclades_port include/linux/cyclades.h | 70 | CYCLADES_MAGIC 0x4359 cyclades_port include/linux/cyclades.h |