diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/acpi/apei/ghes.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/acpi/apei/ghes.c')
| -rw-r--r-- | drivers/acpi/apei/ghes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c index d1d484d4a06a..f703b2881153 100644 --- a/drivers/acpi/apei/ghes.c +++ b/drivers/acpi/apei/ghes.c | |||
| @@ -241,7 +241,7 @@ static inline int ghes_severity(int severity) | |||
| 241 | case CPER_SEV_FATAL: | 241 | case CPER_SEV_FATAL: |
| 242 | return GHES_SEV_PANIC; | 242 | return GHES_SEV_PANIC; |
| 243 | default: | 243 | default: |
| 244 | /* Unkown, go panic */ | 244 | /* Unknown, go panic */ |
| 245 | return GHES_SEV_PANIC; | 245 | return GHES_SEV_PANIC; |
| 246 | } | 246 | } |
| 247 | } | 247 | } |