diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-26 20:39:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-26 20:39:31 -0700 |
| commit | e99b1f22f91cc5e2d06699b3d8958a0ff6cb24d9 (patch) | |
| tree | 58b6fbd9effac9a45fb15fd0cd73e54833daaa55 /arch/powerpc/platforms/ps3/time.c | |
| parent | 5311034ddda7aad48934520d3536b9d0e4502672 (diff) | |
| parent | b080f187adb79bbcbe28814b07cbc1ead34c469a (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc/ps3: Update ps3_defconfig
powerpc/ps3: Add missing check for PS3 to rtc-ps3 platform device registration
Diffstat (limited to 'arch/powerpc/platforms/ps3/time.c')
| -rw-r--r-- | arch/powerpc/platforms/ps3/time.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/ps3/time.c b/arch/powerpc/platforms/ps3/time.c index b178a1e66c9..40b5cb43300 100644 --- a/arch/powerpc/platforms/ps3/time.c +++ b/arch/powerpc/platforms/ps3/time.c @@ -21,6 +21,7 @@ #include <linux/kernel.h> #include <linux/platform_device.h> +#include <asm/firmware.h> #include <asm/rtc.h> #include <asm/lv1call.h> #include <asm/ps3.h> @@ -84,6 +85,9 @@ static int __init ps3_rtc_init(void) { struct platform_device *pdev; + if (!firmware_has_feature(FW_FEATURE_PS3_LV1)) + return -ENODEV; + pdev = platform_device_register_simple("rtc-ps3", -1, NULL, 0); if (IS_ERR(pdev)) return PTR_ERR(pdev); |