diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-08-27 17:05:47 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-08-27 17:06:24 +0200 |
| commit | 4152f93508b184a85a975810b2cc3dc5c597cf57 (patch) | |
| tree | 19dff39aa185f18ed662ab5802d1e873aea5ab44 /arch/powerpc/platforms/ps3/time.c | |
| parent | 6effcd92454ca5d7021b74f89fcac75209e146f9 (diff) | |
| parent | fa84e9eecfff478df2d00e94deb3fc40fe4634ad (diff) | |
Merge branch 'sched/clock' into x86/cleanups
Reason: The tsc init cleanup depends on sched_clock_init moving past
late_time_init.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
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); |