diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 12:12:26 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 12:12:26 -0400 |
commit | 57d19e80f459dd845fb3cfeba8e6df8471bac142 (patch) | |
tree | 8254766715720228db3d50f1ef3c7fe003c06d65 /drivers/net/wireless/ath | |
parent | ee9ec4f82049c678373a611ce20ac67fe9ad836e (diff) | |
parent | e64851f5a0ad6ec991f74ebb3108c35aa0323d5f (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
b43: fix comment typo reqest -> request
Haavard Skinnemoen has left Atmel
cris: typo in mach-fs Makefile
Kconfig: fix copy/paste-ism for dell-wmi-aio driver
doc: timers-howto: fix a typo ("unsgined")
perf: Only include annotate.h once in tools/perf/util/ui/browsers/annotate.c
md, raid5: Fix spelling error in comment ('Ofcourse' --> 'Of course').
treewide: fix a few typos in comments
regulator: change debug statement be consistent with the style of the rest
Revert "arm: mach-u300/gpio: Fix mem_region resource size miscalculations"
audit: acquire creds selectively to reduce atomic op overhead
rtlwifi: don't touch with treewide double semicolon removal
treewide: cleanup continuations and remove logging message whitespace
ath9k_hw: don't touch with treewide double semicolon removal
include/linux/leds-regulator.h: fix syntax in example code
tty: fix typo in descripton of tty_termios_encode_baud_rate
xtensa: remove obsolete BKL kernel option from defconfig
m68k: fix comment typo 'occcured'
arch:Kconfig.locks Remove unused config option.
treewide: remove extra semicolons
...
Diffstat (limited to 'drivers/net/wireless/ath')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c index 1e220354e4be..d985841ff401 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | |||
@@ -3327,26 +3327,26 @@ static int ar9300_eeprom_restore_internal(struct ath_hw *ah, | |||
3327 | else | 3327 | else |
3328 | cptr = AR9300_BASE_ADDR; | 3328 | cptr = AR9300_BASE_ADDR; |
3329 | ath_dbg(common, ATH_DBG_EEPROM, | 3329 | ath_dbg(common, ATH_DBG_EEPROM, |
3330 | "Trying EEPROM accesss at Address 0x%04x\n", cptr); | 3330 | "Trying EEPROM access at Address 0x%04x\n", cptr); |
3331 | if (ar9300_check_eeprom_header(ah, read, cptr)) | 3331 | if (ar9300_check_eeprom_header(ah, read, cptr)) |
3332 | goto found; | 3332 | goto found; |
3333 | 3333 | ||
3334 | cptr = AR9300_BASE_ADDR_512; | 3334 | cptr = AR9300_BASE_ADDR_512; |
3335 | ath_dbg(common, ATH_DBG_EEPROM, | 3335 | ath_dbg(common, ATH_DBG_EEPROM, |
3336 | "Trying EEPROM accesss at Address 0x%04x\n", cptr); | 3336 | "Trying EEPROM access at Address 0x%04x\n", cptr); |
3337 | if (ar9300_check_eeprom_header(ah, read, cptr)) | 3337 | if (ar9300_check_eeprom_header(ah, read, cptr)) |
3338 | goto found; | 3338 | goto found; |
3339 | 3339 | ||
3340 | read = ar9300_read_otp; | 3340 | read = ar9300_read_otp; |
3341 | cptr = AR9300_BASE_ADDR; | 3341 | cptr = AR9300_BASE_ADDR; |
3342 | ath_dbg(common, ATH_DBG_EEPROM, | 3342 | ath_dbg(common, ATH_DBG_EEPROM, |
3343 | "Trying OTP accesss at Address 0x%04x\n", cptr); | 3343 | "Trying OTP access at Address 0x%04x\n", cptr); |
3344 | if (ar9300_check_eeprom_header(ah, read, cptr)) | 3344 | if (ar9300_check_eeprom_header(ah, read, cptr)) |
3345 | goto found; | 3345 | goto found; |
3346 | 3346 | ||
3347 | cptr = AR9300_BASE_ADDR_512; | 3347 | cptr = AR9300_BASE_ADDR_512; |
3348 | ath_dbg(common, ATH_DBG_EEPROM, | 3348 | ath_dbg(common, ATH_DBG_EEPROM, |
3349 | "Trying OTP accesss at Address 0x%04x\n", cptr); | 3349 | "Trying OTP access at Address 0x%04x\n", cptr); |
3350 | if (ar9300_check_eeprom_header(ah, read, cptr)) | 3350 | if (ar9300_check_eeprom_header(ah, read, cptr)) |
3351 | goto found; | 3351 | goto found; |
3352 | 3352 | ||