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/pnp/pnpbios/bioscalls.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/pnp/pnpbios/bioscalls.c')
| -rw-r--r-- | drivers/pnp/pnpbios/bioscalls.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c index 8591f6ab1b35..b859d16cf78c 100644 --- a/drivers/pnp/pnpbios/bioscalls.c +++ b/drivers/pnp/pnpbios/bioscalls.c | |||
| @@ -219,7 +219,7 @@ void pnpbios_print_status(const char *module, u16 status) | |||
| 219 | module); | 219 | module); |
| 220 | break; | 220 | break; |
| 221 | case PNP_HARDWARE_ERROR: | 221 | case PNP_HARDWARE_ERROR: |
| 222 | printk(KERN_ERR "PnPBIOS: %s: a hardware failure has occured\n", | 222 | printk(KERN_ERR "PnPBIOS: %s: a hardware failure has occurred\n", |
| 223 | module); | 223 | module); |
| 224 | break; | 224 | break; |
| 225 | default: | 225 | default: |