diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 12:22:27 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 12:22:27 -0500 |
commit | 9b80b11c3faa460cf42904a1e368bf2cd075aff6 (patch) | |
tree | ecc349bbb90856c97be1b93cc9595ceea82fe2c5 /arch/powerpc/platforms/pseries/setup.c | |
parent | b0b7b8eac33dc0f58ce9e7b7a61cf6529ee0b38c (diff) | |
parent | 271c3f35bd36613513e2c2cc90dc914a84df116e (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'arch/powerpc/platforms/pseries/setup.c')
-rw-r--r-- | arch/powerpc/platforms/pseries/setup.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c index e94247c28d42..31990829310c 100644 --- a/arch/powerpc/platforms/pseries/setup.c +++ b/arch/powerpc/platforms/pseries/setup.c | |||
@@ -306,9 +306,7 @@ static void __init fw_feature_init(void) | |||
306 | } | 306 | } |
307 | 307 | ||
308 | of_node_put(dn); | 308 | of_node_put(dn); |
309 | no_rtas: | 309 | no_rtas: |
310 | printk(KERN_INFO "firmware_features = 0x%lx\n", | ||
311 | ppc64_firmware_features); | ||
312 | 310 | ||
313 | DBG(" <- fw_feature_init()\n"); | 311 | DBG(" <- fw_feature_init()\n"); |
314 | } | 312 | } |