summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-26 12:06:08 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-26 12:06:08 -0800
commitc90c69a508c2fd8d2f892c4b166baffc91111117 (patch)
treefbda802935ab4dfc56a7dc758c787fce4c066c02 /Documentation
parent6842ac64ae2ed2714004a25d53d3b20f0d3af524 (diff)
parent19ba1b19962aeb87a029b37234f54b02e8f7b507 (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.txt1
1 files changed, 0 insertions, 1 deletions
diff --git a/Documentation/magic-number.txt b/Documentation/magic-number.txt
index af67faccf4d..0e740c812d1 100644
--- a/Documentation/magic-number.txt
+++ b/Documentation/magic-number.txt
@@ -65,7 +65,6 @@ CMAGIC 0x0111 user include/linux/a.out.h
MKISS_DRIVER_MAGIC 0x04bf mkiss_channel drivers/net/mkiss.h
RISCOM8_MAGIC 0x0907 riscom_port drivers/char/riscom8.h
SPECIALIX_MAGIC 0x0907 specialix_port drivers/char/specialix_io8.h
-AURORA_MAGIC 0x0A18 Aurora_port drivers/sbus/char/aurora.h
HDLC_MAGIC 0x239e n_hdlc drivers/char/n_hdlc.c
APM_BIOS_MAGIC 0x4101 apm_user arch/i386/kernel/apm.c
CYCLADES_MAGIC 0x4359 cyclades_port include/linux/cyclades.h