aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Kujau <lists@nerdbynature.de>2013-02-21 19:43:05 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-02-21 20:22:20 -0500
commit242260fb858e99674289484bc2bfe3b41f9c4cbb (patch)
tree09dcf9a2a5c21d27ed06f028c0096a727eaf64f3
parent76e8402619cf777a3adae9cd70e56a848a9bf952 (diff)
sun.com documentation fixes
After I came across a help text for SUNGEM mentioning a broken sun.com URL, I felt like fixing those up, as they are now pointing to oracle.com URLs. Signed-off-by: Christian Kujau <lists@nerdbynature.de> Acked-by: David S. Miller <davem@davemloft.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--Documentation/devicetree/booting-without-of.txt2
-rw-r--r--drivers/net/ethernet/sun/Kconfig4
-rw-r--r--include/uapi/linux/elf.h12
-rw-r--r--net/ipv6/Kconfig2
4 files changed, 10 insertions, 10 deletions
diff --git a/Documentation/devicetree/booting-without-of.txt b/Documentation/devicetree/booting-without-of.txt
index d4d66757354e..b2fb2f5e1922 100644
--- a/Documentation/devicetree/booting-without-of.txt
+++ b/Documentation/devicetree/booting-without-of.txt
@@ -1228,7 +1228,7 @@ hierarchy and routing of interrupts in the hardware.
1228The interrupt tree model is fully described in the 1228The interrupt tree model is fully described in the
1229document "Open Firmware Recommended Practice: Interrupt 1229document "Open Firmware Recommended Practice: Interrupt
1230Mapping Version 0.9". The document is available at: 1230Mapping Version 0.9". The document is available at:
1231<http://playground.sun.com/1275/practice>. 1231<http://www.openfirmware.org/ofwg/practice/>
1232 1232
12331) interrupts property 12331) interrupts property
1234---------------------- 1234----------------------
diff --git a/drivers/net/ethernet/sun/Kconfig b/drivers/net/ethernet/sun/Kconfig
index 57bfd8599679..208c39dedc2e 100644
--- a/drivers/net/ethernet/sun/Kconfig
+++ b/drivers/net/ethernet/sun/Kconfig
@@ -61,7 +61,7 @@ config SUNGEM
61 select SUNGEM_PHY 61 select SUNGEM_PHY
62 ---help--- 62 ---help---
63 Support for the Sun GEM chip, aka Sun GigabitEthernet/P 2.0. See also 63 Support for the Sun GEM chip, aka Sun GigabitEthernet/P 2.0. See also
64 <http://www.sun.com/products-n-solutions/hardware/docs/pdf/806-3985-10.pdf>. 64 <http://docs.oracle.com/cd/E19455-01/806-3985-10/806-3985-10.pdf>.
65 65
66config CASSINI 66config CASSINI
67 tristate "Sun Cassini support" 67 tristate "Sun Cassini support"
@@ -69,7 +69,7 @@ config CASSINI
69 select CRC32 69 select CRC32
70 ---help--- 70 ---help---
71 Support for the Sun Cassini chip, aka Sun GigaSwift Ethernet. See also 71 Support for the Sun Cassini chip, aka Sun GigaSwift Ethernet. See also
72 <http://www.sun.com/products-n-solutions/hardware/docs/pdf/817-4341-10.pdf> 72 <http://docs.oracle.com/cd/E19113-01/giga.ether.pci/817-4341-10/817-4341-10.pdf>.
73 73
74config SUNVNET 74config SUNVNET
75 tristate "Sun Virtual Network support" 75 tristate "Sun Virtual Network support"
diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h
index 126a8175e3e2..900b9484445b 100644
--- a/include/uapi/linux/elf.h
+++ b/include/uapi/linux/elf.h
@@ -49,14 +49,14 @@ typedef __s64 Elf64_Sxword;
49 * 49 *
50 * Specifications are available in: 50 * Specifications are available in:
51 * 51 *
52 * - Sun microsystems: Linker and Libraries. 52 * - Oracle: Linker and Libraries.
53 * Part No: 817-1984-17, September 2008. 53 * Part No: 817198419, August 2011.
54 * URL: http://docs.sun.com/app/docs/doc/817-1984 54 * http://docs.oracle.com/cd/E18752_01/pdf/817-1984.pdf
55 * 55 *
56 * - System V ABI AMD64 Architecture Processor Supplement 56 * - System V ABI AMD64 Architecture Processor Supplement
57 * Draft Version 0.99., 57 * Draft Version 0.99.4,
58 * May 11, 2009. 58 * January 13, 2010.
59 * URL: http://www.x86-64.org/ 59 * http://www.cs.washington.edu/education/courses/cse351/12wi/supp-docs/abi.pdf
60 */ 60 */
61#define PN_XNUM 0xffff 61#define PN_XNUM 0xffff
62 62
diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig
index 4f7fe7270e37..a2246afc0007 100644
--- a/net/ipv6/Kconfig
+++ b/net/ipv6/Kconfig
@@ -11,7 +11,7 @@ menuconfig IPV6
11 You will still be able to do traditional IPv4 networking as well. 11 You will still be able to do traditional IPv4 networking as well.
12 12
13 For general information about IPv6, see 13 For general information about IPv6, see
14 <http://playground.sun.com/pub/ipng/html/ipng-main.html>. 14 <https://en.wikipedia.org/wiki/IPv6>.
15 For Linux IPv6 development information, see <http://www.linux-ipv6.org>. 15 For Linux IPv6 development information, see <http://www.linux-ipv6.org>.
16 For specific information about IPv6 under Linux, read the HOWTO at 16 For specific information about IPv6 under Linux, read the HOWTO at
17 <http://www.bieringer.de/linux/IPv6/>. 17 <http://www.bieringer.de/linux/IPv6/>.