Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1fd31707 authored by Russell King's avatar Russell King
Browse files

Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6

parents ca15f790 ffb287c9

arch/arm/mach-pxa/cpufreq-pxa2xx.c

+1 −1
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ static int pxa_set_target(struct cpufreq_policy *policy, 
	return 0;

}



static __init int pxa_cpufreq_init(struct cpufreq_policy *policy)

static int pxa_cpufreq_init(struct cpufreq_policy *policy)

{

	int i;

	unsigned int freq;

arch/arm/mach-pxa/cpufreq-pxa3xx.c

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ static int pxa3xx_cpufreq_set(struct cpufreq_policy *policy, 
	return 0;

}



static __init int pxa3xx_cpufreq_init(struct cpufreq_policy *policy)

static int pxa3xx_cpufreq_init(struct cpufreq_policy *policy)

{

	int ret = -EINVAL;

arch/arm/mach-pxa/include/mach/mfp-pxa300.h

+2 −2
Original line number Diff line number Diff line
@@ -71,10 +71,10 @@ 
#define GPIO46_CI_DD_7		MFP_CFG_DRV(GPIO46, AF0, DS04X)

#define GPIO47_CI_DD_8		MFP_CFG_DRV(GPIO47, AF1, DS04X)

#define GPIO48_CI_DD_9		MFP_CFG_DRV(GPIO48, AF1, DS04X)

#define GPIO52_CI_HSYNC		MFP_CFG_DRV(GPIO52, AF0, DS04X)

#define GPIO51_CI_VSYNC		MFP_CFG_DRV(GPIO51, AF0, DS04X)

#define GPIO49_CI_MCLK		MFP_CFG_DRV(GPIO49, AF0, DS04X)

#define GPIO50_CI_PCLK		MFP_CFG_DRV(GPIO50, AF0, DS04X)

#define GPIO51_CI_HSYNC		MFP_CFG_DRV(GPIO51, AF0, DS04X)

#define GPIO52_CI_VSYNC		MFP_CFG_DRV(GPIO52, AF0, DS04X)



/* KEYPAD */

#define GPIO3_KP_DKIN_6		MFP_CFG_LPM(GPIO3,   AF2, FLOAT)

arch/arm/plat-pxa/pwm.c

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ static inline void __add_pwm(struct pwm_device *pwm) 


static int __devinit pwm_probe(struct platform_device *pdev)

{

	struct platform_device_id *id = platform_get_device_id(pdev);

	const struct platform_device_id *id = platform_get_device_id(pdev);

	struct pwm_device *pwm, *secondary = NULL;

	struct resource *r;

	int ret = 0;

drivers/video/pxa168fb.c

+3 −3
Original line number Diff line number Diff line
@@ -559,7 +559,7 @@ static struct fb_ops pxa168fb_ops = { 
	.fb_imageblit	= cfb_imageblit,

};



static int __init pxa168fb_init_mode(struct fb_info *info,

static int __devinit pxa168fb_init_mode(struct fb_info *info,

			      struct pxa168fb_mach_info *mi)

{

	struct pxa168fb_info *fbi = info->par;
@@ -599,7 +599,7 @@ static int __init pxa168fb_init_mode(struct fb_info *info, 
	return ret;

}



static int __init pxa168fb_probe(struct platform_device *pdev)

static int __devinit pxa168fb_probe(struct platform_device *pdev)

{

	struct pxa168fb_mach_info *mi;

	struct fb_info *info = 0;
@@ -792,7 +792,7 @@ static struct platform_driver pxa168fb_driver = { 
	.probe		= pxa168fb_probe,

};



static int __devinit pxa168fb_init(void)

static int __init pxa168fb_init(void)

{

	return platform_driver_register(&pxa168fb_driver);

}