diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-13 12:14:05 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-13 12:14:05 -0700 |
| commit | 32235b07b52e948900613e27c5cbd955d084ae8a (patch) | |
| tree | 92b887a4b3b925df4c8e729e72b0f2daac185dbf /drivers/staging/brcm80211/util/bcmsrom.c | |
| parent | 59c23eabdae97a18cfc400339138f6d1dbde926a (diff) | |
| parent | a6360dd37e1a144ed11e6548371bade559a1e4df (diff) | |
Staging: merge 2.6.39-rc3 into staging-next
This was done to handle a number of conflicts, the majority of which
were caused by the big "fix spelling issues" patch.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/util/bcmsrom.c')
| -rw-r--r-- | drivers/staging/brcm80211/util/bcmsrom.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/brcm80211/util/bcmsrom.c b/drivers/staging/brcm80211/util/bcmsrom.c index d93f1c0a89d..2f8d7f7dd62 100644 --- a/drivers/staging/brcm80211/util/bcmsrom.c +++ b/drivers/staging/brcm80211/util/bcmsrom.c @@ -616,7 +616,7 @@ static int initvars_srom_pci(si_t *sih, void *curmap, char **vars, uint *count) /* * Apply CRC over SROM content regardless SROM is present or not, - * and use variable <devpath>sromrev's existance in flash to decide + * and use variable <devpath>sromrev's existence in flash to decide * if we should return an error when CRC fails or read SROM variables * from flash. */ |