Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 197416
b: refs/heads/master
c: 935e99f
h: refs/heads/master
v: v3
  • Loading branch information
Anand Gadiyar authored and Greg Kroah-Hartman committed May 14, 2010
1 parent efa1542 commit 09992c0
Show file tree
Hide file tree
Showing 16 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 83d4b7eb5f319d8c6d8586586cb1d9c0d1a80532
refs/heads/master: 935e99fb0739aa64d0dd7e8a0bc82faec5d8f830
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/das08.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ struct i8254_struct {
#define I8254_CTRL 3

struct das08_private_struct {
unsigned int do_mux_bits; /* bits for do/mux register on boards without seperate do register */
unsigned int do_mux_bits; /* bits for do/mux register on boards without separate do register */
unsigned int do_bits; /* bits for do register on boards with register dedicated to digital out only */
const unsigned int *pg_gainlist;
struct pci_dev *pdev; /* struct for pci-das08 */
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/dream/camera/msm_vfe8x_proc.c
Original file line number Diff line number Diff line change
Expand Up @@ -3828,7 +3828,7 @@ void vfe_camif_config(struct vfe_cmd_camif_config *in)
ctrl->vfeImaskLocal.camifEpoch2Irq = 1;
}

/* save the content to program CAMIF_CONFIG seperately. */
/* save the content to program CAMIF_CONFIG separately. */
ctrl->vfeCamifConfigLocal.camifCfgFromCmd = in->camifConfig;

/* EFS_Config */
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/echo/echo.c
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,7 @@ int16_t oslec_update(struct oslec_state *ec, int16_t tx, int16_t rx)
}
EXPORT_SYMBOL_GPL(oslec_update);

/* This function is seperated from the echo canceller is it is usually called
/* This function is separated from the echo canceller is it is usually called
as part of the tx process. See rx HP (DC blocking) filter above, it's
the same design.
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/rt2860/mlme.h
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ struct rt_trigger_eventa {
u8 BSSID[6];
u8 RegClass; /* Regulatory Class */
u16 Channel;
unsigned long CDCounter; /* Maintain a seperate count down counter for each Event A. */
unsigned long CDCounter; /* Maintain a separate count down counter for each Event A. */
};

/* 20/40 trigger event table */
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/rtl8192e/ieee80211.h
Original file line number Diff line number Diff line change
Expand Up @@ -1846,7 +1846,7 @@ struct ieee80211_device {
spinlock_t bw_spinlock;

spinlock_t reorder_spinlock;
// for HT operation rate set. we use this one for HT data rate to seperate different descriptors
// for HT operation rate set. we use this one for HT data rate to separate different descriptors
//the way fill this is the same as in the IE
u8 Regdot11HTOperationalRateSet[16]; //use RATR format
u8 dot11HTOperationalRateSet[16]; //use RATR format
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/rtl8192e/ieee80211/ieee80211.h
Original file line number Diff line number Diff line change
Expand Up @@ -2067,7 +2067,7 @@ struct ieee80211_device {
spinlock_t bw_spinlock;

spinlock_t reorder_spinlock;
// for HT operation rate set. we use this one for HT data rate to seperate different descriptors
// for HT operation rate set. we use this one for HT data rate to separate different descriptors
//the way fill this is the same as in the IE
u8 Regdot11HTOperationalRateSet[16]; //use RATR format
u8 dot11HTOperationalRateSet[16]; //use RATR format
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/rtl8192e/r8190_rtl8256.c
Original file line number Diff line number Diff line change
Expand Up @@ -802,7 +802,7 @@ MgntDisconnectIBSS(

case RT_OP_MODE_IBSS:
btMsr |= MSR_LINK_ADHOC;
// led link set seperate
// led link set separate
break;

case RT_OP_MODE_AP:
Expand Down Expand Up @@ -885,7 +885,7 @@ MlmeDisassociateRequest(

case RT_OP_MODE_IBSS:
btMsr |= MSR_LINK_ADHOC;
// led link set seperate
// led link set separate
break;

case RT_OP_MODE_AP:
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/rtl8192e/r8192E_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ rtl8192e_SetHwReg(struct net_device *dev,u8 variable,u8* val)

case RT_OP_MODE_IBSS:
btMsr |= MSR_ADHOC;
// led link set seperate
// led link set separate
break;

case RT_OP_MODE_AP:
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/rtl8192su/ieee80211/ieee80211.h
Original file line number Diff line number Diff line change
Expand Up @@ -1152,7 +1152,7 @@ struct ieee80211_device {
spinlock_t reorder_spinlock;
/*
* for HT operation rate set, we use this one for HT data rate to
* seperate different descriptors the way fill this is the same as
* separate different descriptors the way fill this is the same as
* in the IE
*/
u8 Regdot11HTOperationalRateSet[16]; /* use RATR format */
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/rtl8192su/r8192S_phy.c
Original file line number Diff line number Diff line change
Expand Up @@ -882,7 +882,7 @@ phy_BB8192S_Config_ParaFile(struct net_device* dev)

//
// 1. Read PHY_REG.TXT BB INIT!!
// We will seperate as 1T1R/1T2R/1T2R_GREEN/2T2R
// We will separate as 1T1R/1T2R/1T2R_GREEN/2T2R
//
if (priv->rf_type == RF_1T2R || priv->rf_type == RF_2T2R ||
priv->rf_type == RF_1T1R ||priv->rf_type == RF_2T2R_GREEN)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/rtl8192u/ieee80211.h
Original file line number Diff line number Diff line change
Expand Up @@ -1795,7 +1795,7 @@ struct ieee80211_device {

spinlock_t reorder_spinlock;
/* for HT operation rate set. we use this one for HT data rate to
* seperate different descriptors
* separate different descriptors
* the way fill this is the same as in the IE
*/
u8 Regdot11HTOperationalRateSet[16]; /* use RATR format */
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/rtl8192u/ieee80211/ieee80211.h
Original file line number Diff line number Diff line change
Expand Up @@ -1829,7 +1829,7 @@ struct ieee80211_device {
spinlock_t bw_spinlock;

spinlock_t reorder_spinlock;
// for HT operation rate set. we use this one for HT data rate to seperate different descriptors
// for HT operation rate set. we use this one for HT data rate to separate different descriptors
//the way fill this is the same as in the IE
u8 Regdot11HTOperationalRateSet[16]; //use RATR format
u8 dot11HTOperationalRateSet[16]; //use RATR format
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/wlags49_h2/README.wlags49
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ TABLE OF CONTENTS.
the functions to interface to the Network Interface Card (NIC). The HCF
provides for all WaveLAN NIC types one standard interface to the MSF.
This I/F is called the Wireless Connection Interface (WCI) and is the
subject of a seperate document (025726).
subject of a separate document (025726).

The HCF directory contains firmware images to allow the card to operate in
either station (STA) or Access Point (AP) mode. In the build process, the
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/wlags49_h2/wl_priv.c
Original file line number Diff line number Diff line change
Expand Up @@ -654,7 +654,7 @@ int wvlan_uil_put_info( struct uilreq *urq, struct wl_private *lp )
pLtv->u.u16[0] = CNV_INT_TO_LITTLE( pLtv->u.u16[0] );
break;
/* CFG_CNF_OWN_SSID currently same as CNF_DESIRED_SSID. Do we
need seperate storage for this? */
need separate storage for this? */
//case CFG_CNF_OWN_SSID:
case CFG_CNF_OWN_ATIM_WINDOW:
lp->atimWindow = pLtv->u.u16[0];
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/wlags49_h2/wl_wext.c
Original file line number Diff line number Diff line change
Expand Up @@ -3940,7 +3940,7 @@ void wl_wext_event_mic_failed( struct net_device *dev )
MLME-MICHAELMICFAILURE.indication(keyid=# broadcast/unicast addr=addr2)
*/

/* NOTE: Format of MAC address (using colons to seperate bytes) may cause
/* NOTE: Format of MAC address (using colons to separate bytes) may cause
a problem in future versions of the supplicant, if they ever
actually parse these parameters */
#if DBG
Expand Down

0 comments on commit 09992c0

Please sign in to comment.