Merge branch 'for-next' into for-linus

Conflicts: kernel/irq/chip.c
author: Jiri Kosina <jkosina@suse.cz> 2009-12-07 12:36:35 -0500
committer: Jiri Kosina <jkosina@suse.cz> 2009-12-07 12:36:35 -0500
commit: d014d043869cdc591f3a33243d3481fa4479c2d0 (patch)
tree: 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/net/wireless/rt2x00
parent: 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff)
parent: 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff)
5 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2400pci.h b/drivers/net/wireless/rt2x00/rt2400pci.h
index ccd644104ad..aced0577569 100644
--- a/drivers/net/wireless/rt2x00/rt2400pci.h
+++ b/drivers/net/wireless/rt2x00/rt2400pci.h
@@ -35,7 +35,7 @@
 /*
 * Signal information.
- * Defaul offset is required for RSSI <-> dBm conversion.
+ * Default offset is required for RSSI <-> dBm conversion.
 */
 #define DEFAULT_RSSI_OFFSET             100
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.h b/drivers/net/wireless/rt2x00/rt2500pci.h
index 54d37957883..3db9041838a 100644
--- a/drivers/net/wireless/rt2x00/rt2500pci.h
+++ b/drivers/net/wireless/rt2x00/rt2500pci.h
@@ -46,7 +46,7 @@
 /*
 * Signal information.
- * Defaul offset is required for RSSI <-> dBm conversion.
+ * Default offset is required for RSSI <-> dBm conversion.
 */
 #define DEFAULT_RSSI_OFFSET             121
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.h b/drivers/net/wireless/rt2x00/rt2500usb.h
index b01edca4258..d3000827883 100644
--- a/drivers/net/wireless/rt2x00/rt2500usb.h
+++ b/drivers/net/wireless/rt2x00/rt2500usb.h
@@ -46,7 +46,7 @@
 /*
 * Signal information.
- * Defaul offset is required for RSSI <-> dBm conversion.
+ * Default offset is required for RSSI <-> dBm conversion.
 */
 #define DEFAULT_RSSI_OFFSET             120
diff --git a/drivers/net/wireless/rt2x00/rt61pci.h b/drivers/net/wireless/rt2x00/rt61pci.h
index 93eb699165c..77b5116f549 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.h
+++ b/drivers/net/wireless/rt2x00/rt61pci.h
@@ -37,7 +37,7 @@
 /*
 * Signal information.
- * Defaul offset is required for RSSI <-> dBm conversion.
+ * Default offset is required for RSSI <-> dBm conversion.
 */
 #define DEFAULT_RSSI_OFFSET             120
diff --git a/drivers/net/wireless/rt2x00/rt73usb.h b/drivers/net/wireless/rt2x00/rt73usb.h
index 81fe0be51c4..e194332dac5 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.h
+++ b/drivers/net/wireless/rt2x00/rt73usb.h
@@ -37,7 +37,7 @@
 /*
 * Signal information.
- * Defaul offset is required for RSSI <-> dBm conversion.
+ * Default offset is required for RSSI <-> dBm conversion.
 */
 #define DEFAULT_RSSI_OFFSET             120
author	Jiri Kosina <jkosina@suse.cz>	2009-12-07 12:36:35 -0500
committer	Jiri Kosina <jkosina@suse.cz>	2009-12-07 12:36:35 -0500
commit	d014d043869cdc591f3a33243d3481fa4479c2d0 (patch)
tree	63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/net/wireless/rt2x00
parent	6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff)
parent	6070d81eb5f2d4943223c96e7609a53cdc984364 (diff)

diff --git a/drivers/net/wireless/rt2x00/rt2400pci.h b/drivers/net/wireless/rt2x00/rt2400pci.h index ccd644104ad..aced0577569 100644 --- a/drivers/net/wireless/rt2x00/rt2400pci.h +++ b/drivers/net/wireless/rt2x00/rt2400pci.h
@@ -35,7 +35,7 @@
35		35
36	/*	36	/*
37	* Signal information.	37	* Signal information.
38	* Defaul offset is required for RSSI <-> dBm conversion.	38	* Default offset is required for RSSI <-> dBm conversion.
39	*/	39	*/
40	#define DEFAULT_RSSI_OFFSET 100	40	#define DEFAULT_RSSI_OFFSET 100
41		41


diff --git a/drivers/net/wireless/rt2x00/rt2500pci.h b/drivers/net/wireless/rt2x00/rt2500pci.h index 54d37957883..3db9041838a 100644 --- a/drivers/net/wireless/rt2x00/rt2500pci.h +++ b/drivers/net/wireless/rt2x00/rt2500pci.h
@@ -46,7 +46,7 @@
46		46
47	/*	47	/*
48	* Signal information.	48	* Signal information.
49	* Defaul offset is required for RSSI <-> dBm conversion.	49	* Default offset is required for RSSI <-> dBm conversion.
50	*/	50	*/
51	#define DEFAULT_RSSI_OFFSET 121	51	#define DEFAULT_RSSI_OFFSET 121
52		52


diff --git a/drivers/net/wireless/rt2x00/rt2500usb.h b/drivers/net/wireless/rt2x00/rt2500usb.h index b01edca4258..d3000827883 100644 --- a/drivers/net/wireless/rt2x00/rt2500usb.h +++ b/drivers/net/wireless/rt2x00/rt2500usb.h
@@ -46,7 +46,7 @@
46		46
47	/*	47	/*
48	* Signal information.	48	* Signal information.
49	* Defaul offset is required for RSSI <-> dBm conversion.	49	* Default offset is required for RSSI <-> dBm conversion.
50	*/	50	*/
51	#define DEFAULT_RSSI_OFFSET 120	51	#define DEFAULT_RSSI_OFFSET 120
52		52


diff --git a/drivers/net/wireless/rt2x00/rt61pci.h b/drivers/net/wireless/rt2x00/rt61pci.h index 93eb699165c..77b5116f549 100644 --- a/drivers/net/wireless/rt2x00/rt61pci.h +++ b/drivers/net/wireless/rt2x00/rt61pci.h
@@ -37,7 +37,7 @@
37		37
38	/*	38	/*
39	* Signal information.	39	* Signal information.
40	* Defaul offset is required for RSSI <-> dBm conversion.	40	* Default offset is required for RSSI <-> dBm conversion.
41	*/	41	*/
42	#define DEFAULT_RSSI_OFFSET 120	42	#define DEFAULT_RSSI_OFFSET 120
43		43


diff --git a/drivers/net/wireless/rt2x00/rt73usb.h b/drivers/net/wireless/rt2x00/rt73usb.h index 81fe0be51c4..e194332dac5 100644 --- a/drivers/net/wireless/rt2x00/rt73usb.h +++ b/drivers/net/wireless/rt2x00/rt73usb.h
@@ -37,7 +37,7 @@
37		37
38	/*	38	/*
39	* Signal information.	39	* Signal information.
40	* Defaul offset is required for RSSI <-> dBm conversion.	40	* Default offset is required for RSSI <-> dBm conversion.
41	*/	41	*/
42	#define DEFAULT_RSSI_OFFSET 120	42	#define DEFAULT_RSSI_OFFSET 120
43		43