[PATCH] trivial bits.

Adrian Bunk went through .39-dj, and pulled out a bunch of trivial bits (docs changes, whitespace fixes etc) - CREDITS: update the web-address of Tigran A. Aivazian - Documentation/Changes: higher minimum version of reiserfsprogs - s/www.linuxdoc.org/www.tldp.org/g in: - Documentation/DocBook/sis900.tmpl - Documentation/kernel-docs.txt - Documentation/scsi-generic.txt - Documentation/scsi.txt - Documentation/sound/oss/PAS16 - Documentation/filesystems/isofs.txt: document where to get ISO 9660 docs from - Documentation/networking/00-INDEX: document that e100.txt and e1000.txt are present - typo fixes in: - Documentation/networking/ip-sysctl.txt - Documentation/s390/Debugging390.txt - drivers/ide/Config.help - MAINTAINERS: - update location of the emu10k1-devel and linux-mips lists - Remy Card is no longer ext2 maintainer - list Andrew Morton instead of Remy Card as second ext3 maintainer - update mail addresses of Riley H. Williams and Jack Hammer - misc whitespace -> tab fixes - arch/mips/kernel/time.c: correct the location of a README - whitespace -> tab fixes in drivers/net/{3c505,3c509,arcnet/arcnet,at1700,hamradio/scc,ni65, pcmcia/aironet4500_cs}.c and drivers/net/wan/lmc/lmc_var.h - drivers/pci/quirks.c: update URL - remove tabs/whitespace at the end of lines in: - drivers/tc/lk201-map.map - drivers/tc/lk201-remap.c - drivers/tc/zs.h - fs/jfs/jfs_logmgr.c: remove two extra empty lines - include/linux/auto_fs.h: s/__x86_64/__x86_64__/

[PATCH] trivial bits.
Adrian Bunk went through .39-dj, and pulled out a bunch of trivial bits (docs changes, whitespace fixes etc) - CREDITS: update the web-address of Tigran A. Aivazian - Documentation/Changes: higher minimum version of reiserfsprogs - s/www.linuxdoc.org/www.tldp.org/g in: - Documentation/DocBook/sis900.tmpl - Documentation/kernel-docs.txt - Documentation/scsi-generic.txt - Documentation/scsi.txt - Documentation/sound/oss/PAS16 - Documentation/filesystems/isofs.txt: document where to get ISO 9660 docs from - Documentation/networking/00-INDEX: document that e100.txt and e1000.txt are present - typo fixes in: - Documentation/networking/ip-sysctl.txt - Documentation/s390/Debugging390.txt - drivers/ide/Config.help - MAINTAINERS: - update location of the emu10k1-devel and linux-mips lists - Remy Card is no longer ext2 maintainer - list Andrew Morton instead of Remy Card as second ext3 maintainer - update mail addresses of Riley H. Williams and Jack Hammer - misc whitespace -> tab fixes - arch/mips/kernel/time.c: correct the location of a README - whitespace -> tab fixes in drivers/net/{3c505,3c509,arcnet/arcnet,at1700,hamradio/scc,ni65, pcmcia/aironet4500_cs}.c and drivers/net/wan/lmc/lmc_var.h - drivers/pci/quirks.c: update URL - remove tabs/whitespace at the end of lines in: - drivers/tc/lk201-map.map - drivers/tc/lk201-remap.c - drivers/tc/zs.h - fs/jfs/jfs_logmgr.c: remove two extra empty lines - include/linux/auto_fs.h: s/__x86_64/__x86_64__/
4aaae0d9 · Dave Jones · 1c6232c3 · 4aaae0d9 · 4aaae0d9 · 4aaae0d9
Commit 4aaae0d9 authored Sep 30, 2002 by Dave Jones
28 changed files
--- a/CREDITS
+++ b/CREDITS
@@ -39,7 +39,7 @@ S: Ireland

 N: Tigran A. Aivazian
 E: tigran@veritas.com
-W: http://www.ocston.org/~tigran
+W: http://www.moses.uklinux.net/patches
 D: BFS filesystem
 D: Intel IA32 CPU microcode update support
 D: Various kernel patches

--- a/Documentation/Changes
+++ b/Documentation/Changes
@@ -55,7 +55,7 @@ o  util-linux             2.10o                   # fdformat --version
 o  modutils               2.4.2                   # insmod -V
 o  e2fsprogs              1.25                    # tune2fs
 o  jfsutils               1.0.14                  # fsck.jfs -V
-o  reiserfsprogs          3.x.1b                  # reiserfsck 2>&1|grep reiserfsprogs
+o  reiserfsprogs          3.6.3                   # reiserfsck -V 2>&1|grep reiserfsprogs
 o  xfsprogs               2.1.0                   # xfs_db -V
 o  pcmcia-cs              3.1.21                  # cardmgr -V
 o  PPP                    2.4.0                   # pppd --version
@@ -229,7 +229,6 @@ If you are running v0.1.17 or earlier, you should upgrade to
 version v0.99.0 or higher. Running old versions may cause problems
 with programs using shared memory.

-
 Networking
 ==========

@@ -326,7 +325,7 @@ o  <http://oss.software.ibm.com/jfs>

 Reiserfsprogs
 -------------
-o  <ftp://ftp.namesys.com/pub/reiserfsprogs/reiserfsprogs-3.x.1b.tar.gz>
+o  <http://www.namesys.com/pub/reiserfsprogs/reiserfsprogs-3.6.3.tar.gz>

 Xfsprogs
 --------

--- a/Documentation/DocBook/sis900.tmpl
+++ b/Documentation/DocBook/sis900.tmpl
@@ -323,8 +323,8 @@ and its mirrors.
 The 1.06 revision can be found in kernel version later than 2.3.15 and pre-2.2.14, 
 and 1.07 revision can be found in kernel version 2.4.0.
 If you have no prior experience in networking under Linux, please read
-<ULink URL="http://www.linuxdoc.org/">Ethernet HOWTO</ULink> and
-<ULink URL="http://www.linuxdoc.org/">Networking HOWTO</ULink> available from
+<ULink URL="http://www.tldp.org/">Ethernet HOWTO</ULink> and
+<ULink URL="http://www.tldp.org/">Networking HOWTO</ULink> available from
 Linux Documentation Project (LDP).
 </Para>

@@ -435,7 +435,7 @@ netmask respectively. TYPE is used to set medium type used by the device.
 Typical values are "10baseT"(twisted-pair 10Mbps Ethernet) or "100baseT"
 (twisted-pair 100Mbps Ethernet). For more information on how to configure 
 network interface, please refer to  
-<ULink URL="http://www.linuxdoc.org/">Networking HOWTO</ULink>.
+<ULink URL="http://www.tldp.org/">Networking HOWTO</ULink>.
 </Para>

 <Para>

--- a/Documentation/filesystems/isofs.txt
+++ b/Documentation/filesystems/isofs.txt
@@ -29,3 +29,10 @@ Mount options unique to the isofs filesystem.
  unhide        Show hidden files.
  session=x     Select number of session on multisession CD
  sbsector=xxx  Session begins from sector xxx
+
+Recommended documents about ISO 9660 standard are located at:
+http://www.y-adagio.com/public/standards/iso_cdromr/tocont.htm
+ftp://ftp.ecma.ch/ecma-st/Ecma-119.pdf
+Quoting from the PDF "This 2nd Edition of Standard ECMA-119 is technically 
+identical with ISO 9660.", so it is a valid and gratis substitute of the
+official ISO specification.
--- a/Documentation/kernel-docs.txt
+++ b/Documentation/kernel-docs.txt
@@ -41,7 +41,7 @@
       
     * Title: "The Linux Kernel"
       Author: David A. Rusling.
-       URL: http://www.linuxdoc.org/LDP/tlk/tlk.html
+       URL: http://www.tldp.org/LDP/tlk/tlk.html
       Keywords: everything!, book.
       Description: On line, 200 pages book describing most aspects of
       the Linux Kernel. Probably, the first reference for beginners.
@@ -57,7 +57,7 @@
       
     * Title: "The Linux Kernel Hackers' Guide"
       Author: Michael K.Johnson and others.
-       URL: http://www.linuxdoc.org/LDP/khg/HyperNews/get/khg.html
+       URL: http://www.tldp.org/LDP/khg/HyperNews/get/khg.html
       Keywords: everything!
       Description: No more Postscript book-like version. Only HTML now.
       Many people have contributed. The interface is similar to web
@@ -277,7 +277,7 @@
       
     * Title: "Linux Kernel Module Programming Guide"
       Author: Ori Pomerantz.
-       URL: http://www.linuxdoc.org/LDP/lkmpg/mpg.html
+       URL: http://www.tldp.org/LDP/lkmpg/mpg.html
       Keywords: modules, GPL book, /proc, ioctls, system calls,
       interrupt handlers .
       Description: Very nice 92 pages GPL book on the topic of modules

--- a/Documentation/networking/00-INDEX
+++ b/Documentation/networking/00-INDEX
@@ -44,6 +44,10 @@ dgrs.txt
 	- the Digi International RightSwitch SE-X Ethernet driver
 dmfe.txt
 	- info on the Davicom DM9102(A)/DM9132/DM9801 fast ethernet driver.
+e100.txt
+	- info on Intel's EtherExpress PRO/100 line of 10/100 boards
+e1000.txt
+	- info on Intel's E1000 line of gigabit ethernet boards
 eql.txt
 	- serial IP load balancing
 ethertap.txt

--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -89,7 +89,7 @@ tcp_keepalive_intvl - INTEGER

 tcp_retries1 - INTEGER
 	How many times to retry before deciding that something is wrong
-	and it is necessary to report this suspection to network layer.
+	and it is necessary to report this suspicion to network layer.
 	Minimal RFC value is 3, it is default, which corresponds
 	to ~3sec-8min depending on RTO.

@@ -200,7 +200,7 @@ tcp_sack - BOOLEAN
 	Enable select acknowledgments (SACKS).

 tcp_fack - BOOLEAN
-	Enable FACK congestion avoidance and fast restransmission.
+	Enable FACK congestion avoidance and fast retransmission.
 	The value is not used, if tcp_sack is not enabled.

 tcp_dsack - BOOLEAN
@@ -256,7 +256,7 @@ tcp_mem - vector of 3 INTEGERs: min, pressure, max

 	pressure: when amount of memory allocated by TCP exceeds this number
 	of pages, TCP moderates its memory consumption and enters memory
-	pressure mode, which is exited when memory consumtion falls
+	pressure mode, which is exited when memory consumption falls
 	under "low".

 	high: number of pages allowed for queueing by all TCP sockets.
@@ -278,7 +278,7 @@ tcp_adv_win_scale - INTEGER
 tcp_rfc1337 - BOOLEAN
 	If set, the TCP stack behaves conforming to RFC1337. If unset,
 	we are not conforming to RFC, but prevent TCP TIME_WAIT
-	asassination.	
+	assassination.   
 	Default: 0

 ip_local_port_range - 2 INTEGERS
@@ -295,7 +295,7 @@ ip_local_port_range - 2 INTEGERS
 	2000 connections per second to systems supporting timestamps.

 ip_nonlocal_bind - BOOLEAN
-	If set, allows processes to bind() to non-local IP adresses,
+	If set, allows processes to bind() to non-local IP addresses,
 	which can be quite useful - but may break some applications.
 	Default: 0


--- a/Documentation/s390/Debugging390.txt
+++ b/Documentation/s390/Debugging390.txt
@@ -238,7 +238,7 @@ they go to 64 Bit.

 On 390 our limitations & strengths make us slightly different.
 For backward compatibility ( because of the psw address hi bit which
-indicates whether we are in 31 or 24 bit mode ) we are only allowed 
+indicates whether we are in 31 or 64 bit mode ) we are only allowed 
 use 31 bits (2GB) of our 32 bit addresses. However, 
 we use entirely separate address  spaces for the user & kernel.


--- a/Documentation/scsi-generic.txt
+++ b/Documentation/scsi-generic.txt
@@ -30,7 +30,7 @@ Sg driver documentation
 =======================
 The most recent documentation of the sg driver is kept at the Linux
 Documentation Project's (LDP) site: 
-http://www.linuxdoc.org/HOWTO/SCSI-Generic-HOWTO
+http://www.tldp.org/HOWTO/SCSI-Generic-HOWTO
 This describes the sg version 3 driver found in the lk 2.4 series.
 The LDP renders documents in single and multiple page HTML, postscript
 and pdf. This document can also be found at:
@@ -51,7 +51,7 @@ in /usr/include/scsi/sg.h . Driver debugging information and other notes
 can be found at the top of the /usr/src/linux/drivers/scsi/sg.c file.

 A more general description of the Linux SCSI subsystem of which sg is a 
-part can be found at http://www.linuxdoc.org/HOWTO/SCSI-2.4-HOWTO .
+part can be found at http://www.tldp.org/HOWTO/SCSI-2.4-HOWTO .


 Example code and utilities

--- a/Documentation/scsi.txt
+++ b/Documentation/scsi.txt
@@ -2,7 +2,7 @@ SCSI subsystem documentation
 ============================
 The Linux Documentation Project (LDP) maintains a document describing
 the SCSI subsystem in the Linux kernel (lk) 2.4 series. See:
-http://www.linuxdoc.org/HOWTO/SCSI-2.4-HOWTO . The LDP has single
+http://www.tldp.org/HOWTO/SCSI-2.4-HOWTO . The LDP has single
 and multiple page HTML renderings as well as postscript and pdf.
 It can also be found at http://www.torque.net/scsi/SCSI-2.4-HOWTO .


--- a/Documentation/sound/oss/PAS16
+++ b/Documentation/sound/oss/PAS16
@@ -71,7 +71,7 @@ CONFIG_SOUND
  interrupt and DMA channel), because you will be asked for it.

  You want to read the Sound-HOWTO, available from
-  http://www.linuxdoc.org/docs.html#howto . General information
+  http://www.tldp.org/docs.html#howto . General information
  about the modular sound system is contained in the files
  Documentation/sound/Introduction. The file
  Documentation/sound/README.OSS contains some slightly outdated but

--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -552,7 +552,7 @@ S:	Maintained
 EMU10K1 SOUND DRIVER
 P:	Rui Sousa	
 M:	rui.p.m.sousa@clix.pt	
-L:	emu10k1-devel@opensource.creative.com
+L:	emu10k1-devel@lists.sourceforge.net
 W:	http://opensource.creative.com/
 S:	Maintained

@@ -575,14 +575,12 @@ M:	miku@iki.fi
 S:	Maintained

 EXT2 FILE SYSTEM
-P:	Remy Card
-M:	Remy.Card@linux.org
-L:	linux-kernel@vger.kernel.org
+L:	ext2-devel@lists.sourceforge.net
 S:	Maintained

 EXT3 FILE SYSTEM
-P:	Remy Card, Stephen Tweedie
-M:	sct@redhat.com, akpm@zip.com.au, adilger@turbolinux.com
+P:	Stephen Tweedie, Andrew Morton
+M:	sct@redhat.com, akpm@zip.com.au, adilger@clusterfs.com
 L:	ext3-users@redhat.com
 S:	Maintained

@@ -708,7 +706,7 @@ S:	Maintained

 i386 BOOT CODE
 P:	Riley H. Williams
-M:	rhw@memalpha.cx
+M:	Riley@Williams.Name
 L:	Linux-Kernel@vger.kernel.org
 S:	Maintained

@@ -739,9 +737,9 @@ W:	http://www.uni-mainz.de/~langm000/linux.html
 S:	Maintained

 IBM ServeRAID RAID DRIVER
-P: 	Jack Hammer
+P:	Jack Hammer
 P:	Dave Jeffrey	
-M:	ipslinux@us.ibm.com
+M:	ipslinux@adaptec.com
 W:	http://www.developer.ibm.com/welcome/netfinity/serveraid.html
 S:	Supported 

@@ -839,7 +837,7 @@ S:	Maintained
 IOC3 DRIVER
 P:	Ralf Baechle
 M:	ralf@oss.sgi.com
-L:	linux-mips@oss.sgi.com
+L:	linux-mips@linux-mips.org
 S:	Maintained

 IP MASQUERADING:
@@ -1052,7 +1050,7 @@ MIPS
 P:	Ralf Baechle
 M:	ralf@gnu.org
 W:	http://oss.sgi.com/mips/mips-howto.html
-L:	linux-mips@oss.sgi.com
+L:	linux-mips@linux-mips.org
 S:	Maintained

 MISCELLANEOUS MCA-SUPPORT
@@ -1084,8 +1082,8 @@ S:	Maintained

 NATSEMI ETHERNET DRIVER (DP8381x)
 P: 	Tim Hockin
-M:  thockin@hockin.org
-S:  Maintained
+M:	thockin@hockin.org
+S:	Maintained

 NCP FILESYSTEM
 P:	Petr Vandrovec
@@ -1333,10 +1331,10 @@ W:	http://www.alarsen.net/linux/qnx4fs/
 S:	Maintained

 RADEON FRAMEBUFFER DISPLAY DRIVER
-P:  Ani Joshi
-M:  ajoshi@shell.unixbox.com
-L:  linux-fbdev-devel@lists.sourceforge.net
-S:  Maintained
+P:	Ani Joshi
+M:	ajoshi@shell.unixbox.com
+L:	linux-fbdev-devel@lists.sourceforge.net
+S:	Maintained

 RAGE128 FRAMEBUFFER DISPLAY DRIVER
 P:	Ani Joshi

--- a/arch/mips/kernel/time.c
+++ b/arch/mips/kernel/time.c
@@ -3,7 +3,7 @@
 * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
 *
 * Common time service routines for MIPS machines. See 
- * Documents/MIPS/README.txt. 
+ * Documentation/mips/time.README. 
 *
 * This program is free software; you can redistribute  it and/or modify it
 * under  the terms of  the GNU General  Public License as published by the

--- a/drivers/ide/Config.help
+++ b/drivers/ide/Config.help
@@ -292,7 +292,7 @@ CONFIG_IDEDMA_PCI_AUTO
  motherboard uses a VIA VP2 chipset, in which case you should say N.

 CONFIG_IDEDMA_IVB
-  There are unclear terms is ATA-4 and ATA-5 standards how certain
+  There are unclear terms in ATA-4 and ATA-5 standards how certain
  hardware (an 80c ribbon) should be detected. Different interpretations
  of the standards have been released in hardware. This causes problems:
  for example, a host with Ultra Mode 4 (or higher) will not run

--- a/drivers/net/3c505.c
+++ b/drivers/net/3c505.c
@@ -1396,7 +1396,7 @@ static int __init elp_sense(struct net_device *dev)
 	int timeout;
 	int addr = dev->base_addr;
 	const char *name = dev->name;
-       unsigned long flags;
+	unsigned long flags;
 	byte orig_HSR;

 	if (!request_region(addr, ELP_IO_EXTENT, "3c505"))

--- a/drivers/net/3c509.c
+++ b/drivers/net/3c509.c
@@ -47,8 +47,8 @@
 			- ethtool support
 		v1.18b 1Mar2002 Zwane Mwaikambo <zwane@commfireservices.com>
 			- Power Management support
-                v1.18c 1Mar2002 David Ruggiero <jdr@farfalle.com>
-                        - Full duplex support
+		v1.18c 1Mar2002 David Ruggiero <jdr@farfalle.com>
+			- Full duplex support
 */

 #define DRV_NAME	"3c509"
@@ -500,10 +500,10 @@ int __init el3_probe(struct net_device *dev, int card_idx)
 	memcpy(dev->dev_addr, phys_addr, sizeof(phys_addr));
 	dev->base_addr = ioaddr;
 	dev->irq = irq;
-        
+
 	if (dev->mem_start & 0x05) { /* xcvr codes 1/3/4/12 */
 		dev->if_port = (dev->mem_start & 0x0f);
-        } else { /* xcvr codes 0/8 */
+	} else { /* xcvr codes 0/8 */
 		/* use eeprom value, but save user's full-duplex selection */
 		dev->if_port = (if_port | (dev->mem_start & 0x08) );
 	}

--- a/drivers/net/arcnet/arcnet.c
+++ b/drivers/net/arcnet/arcnet.c
@@ -186,7 +186,7 @@ void cleanup_module(void)
 void arcnet_dump_skb(struct net_device *dev, struct sk_buff *skb, char *desc)
 {
 	int i;
-       unsigned long flags;
+	unsigned long flags;

 	save_flags(flags);
 	cli();
@@ -212,7 +212,7 @@ void arcnet_dump_packet(struct net_device *dev, int bufnum, char *desc)
 {
 	struct arcnet_local *lp = (struct arcnet_local *) dev->priv;
 	int i, length;
-       unsigned long flags;
+	unsigned long flags;
 	static uint8_t buf[512];

 	save_flags(flags);

--- a/drivers/net/at1700.c
+++ b/drivers/net/at1700.c
@@ -808,7 +808,7 @@ set_rx_mode(struct net_device *dev)
 	int ioaddr = dev->base_addr;
 	struct net_local *lp = (struct net_local *)dev->priv;
 	unsigned char mc_filter[8];		 /* Multicast hash filter */
-       unsigned long flags;
+	unsigned long flags;
 	int i;

 	if (dev->flags & IFF_PROMISC) {

--- a/drivers/net/hamradio/scc.c
+++ b/drivers/net/hamradio/scc.c
@@ -2129,7 +2129,7 @@ static int __init scc_init_driver (void)

 static void __exit scc_cleanup_driver(void)
 {
-       unsigned long flags;
+	unsigned long flags;
 	io_port ctrl;
 	int k;
 	struct scc_channel *scc;

--- a/drivers/net/ni65.c
+++ b/drivers/net/ni65.c
@@ -1108,7 +1108,7 @@ static int ni65_send_packet(struct sk_buff *skb, struct net_device *dev)
 	{
 		short len = ETH_ZLEN < skb->len ? skb->len : ETH_ZLEN;
 		struct tmd *tmdp;
-               unsigned long flags;
+		unsigned long flags;

 #ifdef XMT_VIA_SKB
 		if( (unsigned long) (skb->data + skb->len) > 0x1000000) {

--- a/drivers/net/pcmcia/aironet4500_cs.c
+++ b/drivers/net/pcmcia/aironet4500_cs.c
@@ -347,7 +347,7 @@ static dev_link_t *awc_attach(void)
 static void awc_detach(dev_link_t *link)
 {
 	dev_link_t **linkp;
-       unsigned long flags;
+	unsigned long flags;
 	int i=0;

 	DEBUG(0, "awc_detach(0x%p)\n", link);

--- a/drivers/net/wan/lmc/lmc_var.h
+++ b/drivers/net/wan/lmc/lmc_var.h
@@ -87,7 +87,7 @@ typedef struct lmc___ctl lmc_ctl_t;
 		lmc_delay(); \
 		LMC_CSR_WRITE((sc), csr_9, 0x30000); \
                lmc_delay(); \
-		n--; }} while(0);
+		n--; }} while(0)

 struct lmc_regfile_t {
    lmc_csrptr_t csr_busmode;                  /* CSR0 */

--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -90,7 +90,7 @@ static void __init quirk_triton(struct pci_dev *dev)
 *	VIA Apollo KT133 needs PCI latency patch
 *	Made according to a windows driver based patch by George E. Breese
 *	see PCI Latency Adjust on http://www.viahardware.com/download/viatweak.shtm
- *      Also see http://home.tiscalinet.de/au-ja/review-kt133a-1-en.html for
+ *      Also see http://www.au-ja.org/review-kt133a-1-en.phtml for
 *      the info on which Mr Breese based his work.
 *
 *	Updated based on further information from the site and also on

--- a/drivers/tc/lk201-map.map
+++ b/drivers/tc/lk201-map.map
@@ -3,8 +3,8 @@ keymaps 0-2,4-5,8,12
 # Change the above line into
 #	keymaps 0-2,4-6,8,12
 # in case you want the entries
-#	altgr   control keycode  83 = Boot            
-#	altgr   control keycode 111 = Boot            
+#	altgr   control keycode  83 = Boot
+#	altgr   control keycode 111 = Boot
 # below.
 #
 # In fact AltGr is used very little, and one more keymap can

--- a/drivers/tc/lk201-remap.c
+++ b/drivers/tc/lk201-remap.c
 /*
 * Keyboard mappings for DEC LK201/401/501 keyboards
- * 
+ *
 * 17.05.99 Michael Engel (engel@unix-ag.org)
 *
 * DEC US keyboards generate keycodes in the range 0x55 - 0xfb
 *
- * This conflicts with Linux scancode conventions which define 
+ * This conflicts with Linux scancode conventions which define
 * 0x00-0x7f as "normal" and 0x80-0xff as "shifted" scancodes, so we
 * have to remap the keycodes to 0x00-0x7f with the scancodeRemap
 * array. The generated scancode is simply the number of the key counted
 * from the left upper to the right lower corner of the keyboard ...
 *
- * These scancodes are then being remapped (I hope ;-)) with the 
+ * These scancodes are then being remapped (I hope ;-)) with the
 * lk501*map[] arrays which define scancode -> Linux code mapping
 *
 * Oh man is this horrible ;-)
@@ -91,7 +91,7 @@ unsigned char scancodeRemap[256] = {
 /* ----- 								*/
 /* 60 */ 0,		0,		0,		0,
 /* ----- F6		F7		F8		F9		*/
-/* 64 */ 0x06,		0x07,		0x08,		0x09, 
+/* 64 */ 0x06,		0x07,		0x08,		0x09,
 /* ----- F10								*/
 /* 68 */ 0x0a,		0,		0,		0,
 /* ----- 								*/

--- a/drivers/tc/zs.h
+++ b/drivers/tc/zs.h
@@ -38,7 +38,7 @@ struct serial_struct {
 /*
 * Definitions for ZILOG_struct (and serial_struct) flags field
 */
-#define ZILOG_HUP_NOTIFY 0x0001 /* Notify getty on hangups and closes 
+#define ZILOG_HUP_NOTIFY 0x0001 /* Notify getty on hangups and closes
 				   on the callout port */
 #define ZILOG_FOURPORT  0x0002	/* Set OU1, OUT2 per AST Fourport settings */
 #define ZILOG_SAK	0x0004	/* Secure Attention Key (Orange book) */
@@ -74,7 +74,7 @@ struct serial_struct {
 #ifdef __KERNEL__
 /*
 * This is our internal structure for each serial port's state.
- * 
+ *
 * Many fields are paralleled by the structure used by the serial_struct
 * structure.
 *

--- a/fs/jfs/jfs_logmgr.c
+++ b/fs/jfs/jfs_logmgr.c
@@ -1202,8 +1202,6 @@ int lmLogInit(struct jfs_log * log)
 	/*
 	 * validate log superblock
 	 */
-
-
 	if (!test_bit(log_INLINELOG, &log->flag))
 		log->l2bsize = 12;	/* XXX kludge alert XXX */
 	if ((rc = lbmRead(log, 1, &bpsuper)))

--- a/include/linux/auto_fs.h
+++ b/include/linux/auto_fs.h
@@ -45,7 +45,7 @@
 * If so, 32-bit user-space code should be backwards compatible.
 */

-#if defined(__sparc__) || defined(__mips__) || defined(__x86_64) \
+#if defined(__sparc__) || defined(__mips__) || defined(__x86_64__) \
 || defined(__powerpc__) || defined(__s390__)
 typedef unsigned int autofs_wqt_t;
 #else