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 /Documentation/ia64/aliasing-test.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 'Documentation/ia64/aliasing-test.c')
| -rw-r--r-- | Documentation/ia64/aliasing-test.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/ia64/aliasing-test.c b/Documentation/ia64/aliasing-test.c index 3dfb76ca6931..5caa2af33207 100644 --- a/Documentation/ia64/aliasing-test.c +++ b/Documentation/ia64/aliasing-test.c | |||
| @@ -177,7 +177,7 @@ static int scan_rom(char *path, char *file) | |||
| 177 | 177 | ||
| 178 | /* | 178 | /* |
| 179 | * It's OK if the ROM is unreadable. Maybe there | 179 | * It's OK if the ROM is unreadable. Maybe there |
| 180 | * is no ROM, or some other error ocurred. The | 180 | * is no ROM, or some other error occurred. The |
| 181 | * important thing is that no MCA happened. | 181 | * important thing is that no MCA happened. |
| 182 | */ | 182 | */ |
| 183 | if (rc > 0) | 183 | if (rc > 0) |