diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/pnp/pnpbios/bioscalls.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.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: |