Merge http://linux-sound.bkbits.net/linux-sound

into home.transmeta.com:/home/torvalds/v2.5/linux

31 files changed, 73 insertions, 56 deletions

diff --git a/include/asm-alpha/io.h b/include/asm-alpha/io.h
index 053532447560..e1646aff4e31 100644
--- a/include/asm-alpha/io.h
+++ b/include/asm-alpha/io.h
@@ -462,6 +462,9 @@ extern void outsl (unsigned long port, const void *src, unsigned long count);
 #define eth_io_copy_and_sum(skb,src,len,unused) \
   memcpy_fromio((skb)->data,(src),(len))
 
+#define isa_eth_io_copy_and_sum(skb,src,len,unused) \
+  isa_memcpy_fromio((skb)->data,(src),(len))
+
 static inline int
 check_signature(unsigned long io_addr, const unsigned char *signature,
 		int length)
diff --git a/include/asm-alpha/unistd.h b/include/asm-alpha/unistd.h
index 0afd0b632d80..1a1d3e81de2b 100644
--- a/include/asm-alpha/unistd.h
+++ b/include/asm-alpha/unistd.h
@@ -348,7 +348,8 @@
 #define __NR_remap_file_pages		410
 #define __NR_set_tid_address		411
 #define __NR_restart_syscall		412
-#define NR_SYSCALLS			413
+#define __NR_fadvise64			413
+#define NR_SYSCALLS			414
 
 #if defined(__GNUC__)
 
diff --git a/include/asm-arm/arch-iop310/serial.h b/include/asm-arm/arch-iop310/serial.h
index 48e20ba12d5c..3d2a5ce8564c 100644
--- a/include/asm-arm/arch-iop310/serial.h
+++ b/include/asm-arm/arch-iop310/serial.h
@@ -24,8 +24,8 @@
 
 #define STD_SERIAL_PORT_DEFNS			\
        /* UART CLK      PORT        IRQ        FLAGS        */			\
-	{ 0, BASE_BAUD, 0xfe810000, IRQ_UART2, STD_COM_FLAGS },  /* ttyS0 */	\
-	{ 0, BASE_BAUD, 0xfe800000, IRQ_UART1, STD_COM_FLAGS }  /* ttyS1 */
+	{ 0, BASE_BAUD, IQ80310_UART2, IRQ_UART2, STD_COM_FLAGS },  /* ttyS0 */	\
+	{ 0, BASE_BAUD, IQ80310_UART1, IRQ_UART1, STD_COM_FLAGS }  /* ttyS1 */
 
 #endif // CONFIG_ARCH_IQ80310
 
diff --git a/include/asm-arm/arch-pxa/time.h b/include/asm-arm/arch-pxa/time.h
index 2ac2928f0b2c..d49cdf95f14d 100644
--- a/include/asm-arm/arch-pxa/time.h
+++ b/include/asm-arm/arch-pxa/time.h
@@ -53,7 +53,7 @@ static void pxa_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 	int next_match;
 
 	/* Loop until we get ahead of the free running timer.
-	 * This ensures an exact clock tick count and time acuracy.
+	 * This ensures an exact clock tick count and time accuracy.
 	 * IRQs are disabled inside the loop to ensure coherence between
 	 * lost_ticks (updated in do_timer()) and the match reg value, so we
 	 * can use do_gettimeofday() from interrupt handlers.
diff --git a/include/asm-arm/arch-sa1100/time.h b/include/asm-arm/arch-sa1100/time.h
index c52eb9588c3c..de96ec3dd688 100644
--- a/include/asm-arm/arch-sa1100/time.h
+++ b/include/asm-arm/arch-sa1100/time.h
@@ -67,7 +67,7 @@ static unsigned long sa1100_gettimeoffset (void)
  * We will be entered with IRQs enabled.
  *
  * Loop until we get ahead of the free running timer.
- * This ensures an exact clock tick count and time acuracy.
+ * This ensures an exact clock tick count and time accuracy.
  * IRQs are disabled inside the loop to ensure coherence between
  * lost_ticks (updated in do_timer()) and the match reg value, so we
  * can use do_gettimeofday() from interrupt handlers.
diff --git a/include/asm-arm/mach/irq.h b/include/asm-arm/mach/irq.h
index 5a3007b97324..03f2bfffa03a 100644
--- a/include/asm-arm/mach/irq.h
+++ b/include/asm-arm/mach/irq.h
@@ -33,9 +33,12 @@ struct irqchip {
 	 */
 	void (*unmask)(unsigned int);
 	/*
-	 * Re-run the IRQ
+	 * Ask the hardware to re-trigger the IRQ.
+	 * Note: This method _must_ _not_ call the interrupt handler.
+	 * If you are unable to retrigger the interrupt, do not
+	 * provide a function, or if you do, return non-zero.
 	 */
-	void (*rerun)(unsigned int);
+	int (*retrigger)(unsigned int);
 	/*
 	 * Set the type of the IRQ.
 	 */
@@ -50,6 +53,7 @@ struct irqdesc {
 	irq_handler_t	handle;
 	struct irqchip	*chip;
 	struct irqaction *action;
+	struct list_head pend;
 	unsigned int	disable_depth;
 
 	unsigned int	triggered: 1;		/* IRQ has occurred	      */
diff --git a/include/asm-arm/proc-armv/processor.h b/include/asm-arm/proc-armv/processor.h
index 390e887d2037..373ca267700c 100644
--- a/include/asm-arm/proc-armv/processor.h
+++ b/include/asm-arm/proc-armv/processor.h
@@ -23,7 +23,7 @@
 #define KERNEL_STACK_SIZE	PAGE_SIZE
 
 #define INIT_EXTRA_THREAD_INFO						\
-	.cpu_domain	= domain_val(DOMAIN_USER, DOMAIN_CLIENT) |	\
+	.cpu_domain	= domain_val(DOMAIN_USER, DOMAIN_MANAGER) |	\
 			  domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) |	\
 			  domain_val(DOMAIN_IO, DOMAIN_CLIENT)
 
diff --git a/include/asm-arm/proc-armv/system.h b/include/asm-arm/proc-armv/system.h
index e95668d52510..e48970ddf836 100644
--- a/include/asm-arm/proc-armv/system.h
+++ b/include/asm-arm/proc-armv/system.h
@@ -14,9 +14,14 @@
 
 #define set_cr(x)					\
 	__asm__ __volatile__(				\
-	"mcr	p15, 0, %0, c1, c0	@ set CR"	\
+	"mcr	p15, 0, %0, c1, c0, 0	@ set CR"	\
 	: : "r" (x))
 
+#define get_cr(x)					\
+	__asm__ __volatile__(				\
+	"mrc	p15, 0, %0, c1, c0, 0	@ get CR"	\
+	: "=r" (x))
+
 #define CR_M	(1 << 0)	/* MMU enable				*/
 #define CR_A	(1 << 1)	/* Alignment abort enable		*/
 #define CR_C	(1 << 2)	/* Dcache enable			*/
@@ -24,9 +29,9 @@
 #define CR_P	(1 << 4)	/* 32-bit exception handler		*/
 #define CR_D	(1 << 5)	/* 32-bit data address range		*/
 #define CR_L	(1 << 6)	/* Implementation defined		*/
-#define CD_B	(1 << 7)	/* Big endian				*/
+#define CR_B	(1 << 7)	/* Big endian				*/
 #define CR_S	(1 << 8)	/* System MMU protection		*/
-#define CD_R	(1 << 9)	/* ROM MMU protection			*/
+#define CR_R	(1 << 9)	/* ROM MMU protection			*/
 #define CR_F	(1 << 10)	/* Implementation defined		*/
 #define CR_Z	(1 << 11)	/* Implementation defined		*/
 #define CR_I	(1 << 12)	/* Icache enable			*/
diff --git a/include/asm-arm/signal.h b/include/asm-arm/signal.h
index 9bb358d1a1c2..eb59aa539b9c 100644
--- a/include/asm-arm/signal.h
+++ b/include/asm-arm/signal.h
@@ -184,9 +184,7 @@ typedef struct sigaltstack {
 
 #ifdef __KERNEL__
 #include <asm/sigcontext.h>
-
-#define HAVE_ARCH_GET_SIGNAL_TO_DELIVER
-
+#define ptrace_signal_deliver(regs, cookie) do { } while (0)
 #endif
 
 #endif
diff --git a/include/asm-m68knommu/mcfne.h b/include/asm-m68knommu/mcfne.h
index 4db715b5141a..045875651e4d 100644
--- a/include/asm-m68knommu/mcfne.h
+++ b/include/asm-m68knommu/mcfne.h
@@ -261,7 +261,7 @@ void ne2000_outsw(unsigned int addr, const void *vbuf, unsigned long len)
 
 /*
  *	Lastly the interrupt set up code...
- *	Minor diferences between the different board types.
+ *	Minor differences between the different board types.
  */
 
 #if defined(CONFIG_M5206) && defined(CONFIG_ARNEWSH)
diff --git a/include/asm-mips64/sn/launch.h b/include/asm-mips64/sn/launch.h
index 478bde9c0dcd..48a831b39c07 100644
--- a/include/asm-mips64/sn/launch.h
+++ b/include/asm-mips64/sn/launch.h
@@ -52,7 +52,7 @@
 /*
  * The launch routine is called only if the complement address is correct.
  *
- * Before control is transferred to a routine, the compliment address
+ * Before control is transferred to a routine, the complement address
  * is zeroed (invalidated) to prevent an accidental call from a spurious
  * interrupt.
  *
diff --git a/include/asm-mips64/sn/nmi.h b/include/asm-mips64/sn/nmi.h
index d2dada9c39c0..edfdc7336202 100644
--- a/include/asm-mips64/sn/nmi.h
+++ b/include/asm-mips64/sn/nmi.h
@@ -42,7 +42,7 @@
  * The NMI routine is called only if the complement address is
  * correct.
  *
- * Before control is transferred to a routine, the compliment address
+ * Before control is transferred to a routine, the complement address
  * is zeroed (invalidated) to prevent an accidental call from a spurious
  * interrupt.
  *
diff --git a/include/asm-ppc/gt64260.h b/include/asm-ppc/gt64260.h
index ad55f6af4318..cf975d1beff3 100644
--- a/include/asm-ppc/gt64260.h
+++ b/include/asm-ppc/gt64260.h
@@ -6,7 +6,7 @@
  * Author: Mark A. Greer <mgreer@mvista.com>
  *
  * 2001 (c) MontaVista, Software, Inc.  This file is licensed under
- * the terms of the GNU General Public License version 2.1.  This program
+ * the terms of the GNU General Public License version 2.  This program
  * is licensed "as is" without any warranty of any kind, whether express
  * or implied.
  */
diff --git a/include/asm-ppc/gt64260_defs.h b/include/asm-ppc/gt64260_defs.h
index ed4a6f6dd483..8ffe378683da 100644
--- a/include/asm-ppc/gt64260_defs.h
+++ b/include/asm-ppc/gt64260_defs.h
@@ -6,7 +6,7 @@
  * Author: Mark A. Greer <mgreer@mvista.com>
  *
  * 2001 (c) MontaVista, Software, Inc.  This file is licensed under
- * the terms of the GNU General Public License version 2.1.  This program
+ * the terms of the GNU General Public License version 2.  This program
  * is licensed "as is" without any warranty of any kind, whether express
  * or implied.
  */
diff --git a/include/asm-ppc/harrier.h b/include/asm-ppc/harrier.h
index 162302f27157..cd6fd1605cff 100644
--- a/include/asm-ppc/harrier.h
+++ b/include/asm-ppc/harrier.h
@@ -7,7 +7,7 @@
  *         dale.farnsworth@mvista.com
  *
  * 2001 (c) MontaVista, Software, Inc.  This file is licensed under
- * the terms of the GNU General Public License version 2.1.  This program
+ * the terms of the GNU General Public License version 2.  This program
  * is licensed "as is" without any warranty of any kind, whether express
  * or implied.
  */
diff --git a/include/asm-ppc/ibm403.h b/include/asm-ppc/ibm403.h
index 15257f554e92..bf6efa0417ab 100644
--- a/include/asm-ppc/ibm403.h
+++ b/include/asm-ppc/ibm403.h
@@ -2,7 +2,7 @@
  * Authors: Armin Kuster <akuster@mvista.com> and Tom Rini <trini@mvista.com>
  *
  * 2001 (c) MontaVista, Software, Inc.  This file is licensed under
- * the terms of the GNU General Public License version 2.1.  This program
+ * the terms of the GNU General Public License version 2.  This program
  * is licensed "as is" without any warranty of any kind, whether express
  * or implied.
  */
diff --git a/include/asm-ppc/ibm405.h b/include/asm-ppc/ibm405.h
index e6dd4db97f7a..4e5be9e2c153 100644
--- a/include/asm-ppc/ibm405.h
+++ b/include/asm-ppc/ibm405.h
@@ -2,7 +2,7 @@
  * Author: Armin Kuster <akuster@mvista.com>
  *
  * 2002 (c) MontaVista, Software, Inc.  This file is licensed under
- * the terms of the GNU General Public License version 2.1.  This program
+ * the terms of the GNU General Public License version 2.  This program
  * is licensed "as is" without any warranty of any kind, whether express
  * or implied.
  */
diff --git a/include/asm-ppc/ibm_ocp_pci.h b/include/asm-ppc/ibm_ocp_pci.h
index 0c554beae306..a81ab6144358 100644
--- a/include/asm-ppc/ibm_ocp_pci.h
+++ b/include/asm-ppc/ibm_ocp_pci.h
@@ -2,7 +2,7 @@
  * Author: Armin Kuster <akuster@mvista.com>
  *
  * 2001-2002 (c) MontaVista, Software, Inc.  This file is licensed under
- * the terms of the GNU General Public License version 2.1.  This program
+ * the terms of the GNU General Public License version 2.  This program
  * is licensed "as is" without any warranty of any kind, whether express
  * or implied.
  */
diff --git a/include/asm-ppc/mpc10x.h b/include/asm-ppc/mpc10x.h
index b7ad80afced7..78b8a0539865 100644
--- a/include/asm-ppc/mpc10x.h
+++ b/include/asm-ppc/mpc10x.h
@@ -8,7 +8,7 @@
  *         mgreer@mvista.com
  *
  * 2001 (c) MontaVista, Software, Inc.  This file is licensed under
- * the terms of the GNU General Public License version 2.1.  This program
+ * the terms of the GNU General Public License version 2.  This program
  * is licensed "as is" without any warranty of any kind, whether express
  * or implied.
  */
diff --git a/include/asm-ppc/ppc405_dma.h b/include/asm-ppc/ppc405_dma.h
index 69b17da1c504..8571360b3f56 100644
--- a/include/asm-ppc/ppc405_dma.h
+++ b/include/asm-ppc/ppc405_dma.h
@@ -2,7 +2,7 @@
  * Author: Pete Popov <ppopov@mvista.com>
  *
  * 2000 (c) MontaVista, Software, Inc.  This file is licensed under
- * the terms of the GNU General Public License version 2.1.  This program
+ * the terms of the GNU General Public License version 2.  This program
  * is licensed "as is" without any warranty of any kind, whether express
  * or implied.
  *
diff --git a/include/asm-ppc/pplus.h b/include/asm-ppc/pplus.h
index 4d00aae691be..3e9fa3682254 100644
--- a/include/asm-ppc/pplus.h
+++ b/include/asm-ppc/pplus.h
@@ -7,7 +7,7 @@
  *         mgreer@mvista.com
  *
  * 2001 (c) MontaVista, Software, Inc.  This file is licensed under
- * the terms of the GNU General Public License version 2.1.  This program
+ * the terms of the GNU General Public License version 2.  This program
  * is licensed "as is" without any warranty of any kind, whether express
  * or implied.
  */
diff --git a/include/asm-ppc/rtc.h b/include/asm-ppc/rtc.h
index ef83cf06a9af..5493ee53f9f8 100644
--- a/include/asm-ppc/rtc.h
+++ b/include/asm-ppc/rtc.h
@@ -4,7 +4,7 @@
  * Author: Tom Rini <trini@mvista.com>
  *
  * 2002 (c) MontaVista, Software, Inc.  This file is licensed under
- * the terms of the GNU General Public License version 2.1.  This program
+ * the terms of the GNU General Public License version 2.  This program
  * is licensed "as is" without any warranty of any kind, whether express
  * or implied.
  *
diff --git a/include/asm-ppc/todc.h b/include/asm-ppc/todc.h
index 518e5b272715..0419f2803ecd 100644
--- a/include/asm-ppc/todc.h
+++ b/include/asm-ppc/todc.h
@@ -8,7 +8,7 @@
  *         mgreer@mvista.com
  *
  * 2001 (c) MontaVista, Software, Inc.  This file is licensed under
- * the terms of the GNU General Public License version 2.1.  This program
+ * the terms of the GNU General Public License version 2.  This program
  * is licensed "as is" without any warranty of any kind, whether express
  * or implied.
  */
diff --git a/include/asm-ppc/unistd.h b/include/asm-ppc/unistd.h
index b3d115b7961b..b516c293586c 100644
--- a/include/asm-ppc/unistd.h
+++ b/include/asm-ppc/unistd.h
@@ -236,6 +236,8 @@
 #define __NR_io_getevents	229
 #define __NR_io_submit		230
 #define __NR_io_cancel		231
+#define __NR_set_tid_address	232
+#define __NR_fadvise64		233
 #define __NR_exit_group		234
 #define __NR_lookup_dcookie	235
 #define __NR_epoll_create	236
diff --git a/include/asm-sparc64/ptrace.h b/include/asm-sparc64/ptrace.h
index e464335fcd44..872e3ebc0379 100644
--- a/include/asm-sparc64/ptrace.h
+++ b/include/asm-sparc64/ptrace.h
@@ -268,7 +268,7 @@ extern void show_regs(struct pt_regs *);
 #define PTRACE_SETFPAREGS         21
 
 /* There are for debugging 64-bit processes, either from a 32 or 64 bit
- * parent.  Thus their compliments are for debugging 32-bit processes only.
+ * parent.  Thus their complements are for debugging 32-bit processes only.
  */
 
 #define PTRACE_GETREGS64	  22
diff --git a/include/linux/kmod.h b/include/linux/kmod.h
index ca24ceb8e2e2..9e9e2c38ab34 100644
--- a/include/linux/kmod.h
+++ b/include/linux/kmod.h
@@ -21,6 +21,7 @@
 
 #include <linux/config.h>
 #include <linux/errno.h>
+#include <linux/compiler.h>
 
 #ifdef CONFIG_KMOD
 extern int request_module(const char * name);
@@ -29,8 +30,7 @@ static inline int request_module(const char * name) { return -ENOSYS; }
 #endif
 
 #define try_then_request_module(x, mod) ((x) ?: request_module(mod), (x))
-extern int exec_usermodehelper(char *program_path, char *argv[], char *envp[]);
-extern int call_usermodehelper(char *path, char *argv[], char *envp[]);
+extern int call_usermodehelper(char *path, char *argv[], char *envp[], int wait);
 
 #ifdef CONFIG_HOTPLUG
 extern char hotplug_path [];
diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
index 706b420fb5c9..5d44a953f423 100644
--- a/include/linux/ptrace.h
+++ b/include/linux/ptrace.h
@@ -3,8 +3,6 @@
 /* ptrace.h */
 /* structs and defines to help the user use the ptrace system call. */
 
-#include <linux/compiler.h>
-
 /* has the defines to get at the registers. */
 
 #define PTRACE_TRACEME		   0
@@ -38,6 +36,8 @@
 #define PTRACE_O_TRACEVFORKDONE	0x00000020
 #define PTRACE_O_TRACEEXIT	0x00000040
 
+#define PTRACE_O_MASK		0x0000007f
+
 /* Wait extended result codes for the above trace options.  */
 #define PTRACE_EVENT_FORK	1
 #define PTRACE_EVENT_VFORK	2
@@ -47,7 +47,27 @@
 #define PTRACE_EVENT_EXIT	6
 
 #include <asm/ptrace.h>
-#include <linux/sched.h>
+
+#ifdef __KERNEL__
+/*
+ * Ptrace flags
+ */
+
+#define PT_PTRACED	0x00000001
+#define PT_DTRACE	0x00000002	/* delayed trace (used on m68k, i386) */
+#define PT_TRACESYSGOOD	0x00000004
+#define PT_PTRACE_CAP	0x00000008	/* ptracer can follow suid-exec */
+#define PT_TRACE_FORK	0x00000010
+#define PT_TRACE_VFORK	0x00000020
+#define PT_TRACE_CLONE	0x00000040
+#define PT_TRACE_EXEC	0x00000080
+#define PT_TRACE_VFORK_DONE	0x00000100
+#define PT_TRACE_EXIT	0x00000200
+
+#define PT_TRACE_MASK	0x000003f4
+
+#include <linux/compiler.h>		/* For unlikely.  */
+#include <linux/sched.h>		/* For struct task_struct.  */
 
 extern int ptrace_readdata(struct task_struct *tsk, unsigned long src, char *dst, int len);
 extern int ptrace_writedata(struct task_struct *tsk, char * src, unsigned long dst, int len);
@@ -58,11 +78,11 @@ extern int ptrace_check_attach(struct task_struct *task, int kill);
 extern int ptrace_request(struct task_struct *child, long request, long addr, long data);
 extern void ptrace_notify(int exit_code);
 extern void __ptrace_link(struct task_struct *child,
-				struct task_struct *new_parent);
+			  struct task_struct *new_parent);
 extern void __ptrace_unlink(struct task_struct *child);
 
 static inline void ptrace_link(struct task_struct *child,
-				struct task_struct *new_parent)
+			       struct task_struct *new_parent)
 {
 	if (unlikely(child->ptrace))
 		__ptrace_link(child, new_parent);
@@ -72,5 +92,6 @@ static inline void ptrace_unlink(struct task_struct *child)
 	if (unlikely(child->ptrace))
 		__ptrace_unlink(child);
 }
+#endif
 
 #endif
diff --git a/include/linux/rtc.h b/include/linux/rtc.h
index 33edafbe6000..0711d71bc858 100644
--- a/include/linux/rtc.h
+++ b/include/linux/rtc.h
@@ -57,8 +57,8 @@ struct rtc_pll_info {
 	int pll_value;      /* get/set correction value */
 	int pll_max;        /* max +ve (faster) adjustment value */
 	int pll_min;        /* max -ve (slower) adjustment value */
-	int pll_posmult;    /* factor for +ve corection */
-	int pll_negmult;    /* factor for -ve corection */
+	int pll_posmult;    /* factor for +ve correction */
+	int pll_negmult;    /* factor for -ve correction */
 	long pll_clock;     /* base PLL frequency */
 };
 
diff --git a/include/linux/sched.h b/include/linux/sched.h
index d3cd5e31e8f9..cfa6fd4d86da 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -446,21 +446,6 @@ do { if (atomic_dec_and_test(&(tsk)->usage)) __put_task_struct(tsk); } while(0)
 #define PF_FSTRANS	0x00020000	/* inside a filesystem transaction */
 #define PF_KSWAPD	0x00040000	/* I am kswapd */
 
-/*
- * Ptrace flags
- */
-
-#define PT_PTRACED	0x00000001
-#define PT_DTRACE	0x00000002	/* delayed trace (used on m68k, i386) */
-#define PT_TRACESYSGOOD	0x00000004
-#define PT_PTRACE_CAP	0x00000008	/* ptracer can follow suid-exec */
-#define PT_TRACE_FORK	0x00000010
-#define PT_TRACE_VFORK	0x00000020
-#define PT_TRACE_CLONE	0x00000040
-#define PT_TRACE_EXEC	0x00000080
-#define PT_TRACE_VFORK_DONE	0x00000100
-#define PT_TRACE_EXIT	0x00000200
-
 #if CONFIG_SMP
 extern void set_cpus_allowed(task_t *p, unsigned long new_mask);
 #else
diff --git a/include/linux/signal.h b/include/linux/signal.h
index 09e4d8587f0a..05e1fd671f82 100644
--- a/include/linux/signal.h
+++ b/include/linux/signal.h
@@ -151,8 +151,6 @@ static inline void sigfillset(sigset_t *set)
 	}
 }
 
-extern char * render_sigset_t(sigset_t *set, char *buffer);
-
 /* Some extensions for manipulating the low 32 signals in particular.  */
 
 static inline void sigaddsetmask(sigset_t *set, unsigned long mask)
diff --git a/include/linux/wireless.h b/include/linux/wireless.h
index bacf44b5c31e..d8cd706651da 100644
--- a/include/linux/wireless.h
+++ b/include/linux/wireless.h
@@ -294,7 +294,7 @@
 #define IW_PRIV_TYPE_FLOAT	0x5000	/* struct iw_freq */
 #define IW_PRIV_TYPE_ADDR	0x6000	/* struct sockaddr */
 
-#define IW_PRIV_SIZE_FIXED	0x0800	/* Variable or fixed nuber of args */
+#define IW_PRIV_SIZE_FIXED	0x0800	/* Variable or fixed number of args */
 
 #define IW_PRIV_SIZE_MASK	0x07FF	/* Max number of those args */