diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b /drivers/net/irda/nsc-ircc.c | |
| parent | f030d60b30855e18ac5bf080fa9e576147623d18 (diff) | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 (diff) | |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.c
Diffstat (limited to 'drivers/net/irda/nsc-ircc.c')
| -rw-r--r-- | drivers/net/irda/nsc-ircc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c index 559fe854d76d..7a963d4e6d06 100644 --- a/drivers/net/irda/nsc-ircc.c +++ b/drivers/net/irda/nsc-ircc.c | |||
| @@ -716,7 +716,7 @@ static int nsc_ircc_probe_338(nsc_chip_t *chip, chipio_t *info) | |||
| 716 | int reg, com = 0; | 716 | int reg, com = 0; |
| 717 | int pnp; | 717 | int pnp; |
| 718 | 718 | ||
| 719 | /* Read funtion enable register (FER) */ | 719 | /* Read function enable register (FER) */ |
| 720 | outb(CFG_338_FER, cfg_base); | 720 | outb(CFG_338_FER, cfg_base); |
| 721 | reg = inb(cfg_base+1); | 721 | reg = inb(cfg_base+1); |
| 722 | 722 | ||