git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
ps3
/
device-init.c
diff --git
a/arch/powerpc/platforms/ps3/device-init.c
b/arch/powerpc/platforms/ps3/device-init.c
index
b341018
..
6c4b583
100644
(file)
--- a/
arch/powerpc/platforms/ps3/device-init.c
+++ b/
arch/powerpc/platforms/ps3/device-init.c
@@
-566,10
+566,10
@@
static int ps3_setup_dynamic_device(const struct ps3_repository_device *repo)
case PS3_DEV_TYPE_STOR_DISK:
result = ps3_setup_storage_dev(repo, PS3_MATCH_ID_STOR_DISK);
case PS3_DEV_TYPE_STOR_DISK:
result = ps3_setup_storage_dev(repo, PS3_MATCH_ID_STOR_DISK);
- /* Some devices are not access
a
ble from the Other OS lpar. */
+ /* Some devices are not access
i
ble from the Other OS lpar. */
if (result == -ENODEV) {
result = 0;
if (result == -ENODEV) {
result = 0;
- pr_debug("%s:%u: not access
a
ble\n", __func__,
+ pr_debug("%s:%u: not access
i
ble\n", __func__,
__LINE__);
}
__LINE__);
}