diff options
author | Heiko Stuebner <heiko@sntech.de> | 2012-01-27 15:35:25 +0900 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-01-27 15:35:47 +0900 |
commit | 04511a6faeed146030dcc5b892beff30fa0a7c9b (patch) | |
tree | 6b57884f33f018cfd781630a1f5542f43f174c79 /arch/arm/mach-s5p64x0/pm.c | |
parent | 9a60571ecf918162553592ef8c4b4450155394a0 (diff) | |
download | linux-3.10-04511a6faeed146030dcc5b892beff30fa0a7c9b.tar.gz linux-3.10-04511a6faeed146030dcc5b892beff30fa0a7c9b.tar.bz2 linux-3.10-04511a6faeed146030dcc5b892beff30fa0a7c9b.zip |
ARM: SAMSUNG: Fix missing api-change from subsys_interface change
Commit 4a858cfc9a (arm: convert sysdev_class to a regular subsystem)
converted the samsung sysdevs into subsys_interface instances.
While the original add-function only had a (struct sys_device *)
parameter, the dev_add from subsys_interface needs
(struct device *, struct subsys_interface *)
leading to "initialized from incompatible pointer type" warnings.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-s5p64x0/pm.c')
-rw-r--r-- | arch/arm/mach-s5p64x0/pm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s5p64x0/pm.c b/arch/arm/mach-s5p64x0/pm.c index 23f9b22439c..9cba18bfe47 100644 --- a/arch/arm/mach-s5p64x0/pm.c +++ b/arch/arm/mach-s5p64x0/pm.c @@ -160,7 +160,7 @@ static void s5p64x0_pm_prepare(void) } -static int s5p64x0_pm_add(struct device *dev) +static int s5p64x0_pm_add(struct device *dev, struct subsys_interface *sif) { pm_cpu_prep = s5p64x0_pm_prepare; pm_cpu_sleep = s5p64x0_cpu_suspend; |