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

Commit 38a6fe8c authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 's3c-fixes-rc4-2' of git://aeryn.fluff.org.uk/bjdooks/linux

parents 320145fa 909db802

arch/arm/plat-s3c24xx/pwm.c

+4 −0
Original line number Diff line number Diff line
@@ -246,6 +246,10 @@ int pwm_config(struct pwm_device *pwm, int duty_ns, int period_ns) 


	tcmp = duty_ns / tin_ns;

	tcmp = tcnt - tcmp;

	/* the pwm hw only checks the compare register after a decrement,

	   so the pin never toggles if tcmp = tcnt */

	if (tcmp == tcnt)

		tcmp--;



	pwm_dbg(pwm, "tin_ns=%lu, tcmp=%ld/%lu\n", tin_ns, tcmp, tcnt);

drivers/serial/s3c2400.c

+4 −4
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static int s3c2400_serial_probe(struct platform_device *dev) 
	return s3c24xx_serial_probe(dev, &s3c2400_uart_inf);

}



static struct platform_driver s3c2400_serial_drv = {

static struct platform_driver s3c2400_serial_driver = {

	.probe		= s3c2400_serial_probe,

	.remove		= __devexit_p(s3c24xx_serial_remove),

	.driver		= {
@@ -85,16 +85,16 @@ static struct platform_driver s3c2400_serial_drv = { 
	},

};



s3c24xx_console_init(&s3c2400_serial_drv, &s3c2400_uart_inf);

s3c24xx_console_init(&s3c2400_serial_driver, &s3c2400_uart_inf);



static inline int s3c2400_serial_init(void)

{

	return s3c24xx_serial_init(&s3c2400_serial_drv, &s3c2400_uart_inf);

	return s3c24xx_serial_init(&s3c2400_serial_driver, &s3c2400_uart_inf);

}



static inline void s3c2400_serial_exit(void)

{

	platform_driver_unregister(&s3c2400_serial_drv);

	platform_driver_unregister(&s3c2400_serial_driver);

}



module_init(s3c2400_serial_init);

drivers/serial/s3c2410.c

+4 −4
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ static int s3c2410_serial_probe(struct platform_device *dev) 
	return s3c24xx_serial_probe(dev, &s3c2410_uart_inf);

}



static struct platform_driver s3c2410_serial_drv = {

static struct platform_driver s3c2410_serial_driver = {

	.probe		= s3c2410_serial_probe,

	.remove		= __devexit_p(s3c24xx_serial_remove),

	.driver		= {
@@ -97,16 +97,16 @@ static struct platform_driver s3c2410_serial_drv = { 
	},

};



s3c24xx_console_init(&s3c2410_serial_drv, &s3c2410_uart_inf);

s3c24xx_console_init(&s3c2410_serial_driver, &s3c2410_uart_inf);



static int __init s3c2410_serial_init(void)

{

	return s3c24xx_serial_init(&s3c2410_serial_drv, &s3c2410_uart_inf);

	return s3c24xx_serial_init(&s3c2410_serial_driver, &s3c2410_uart_inf);

}



static void __exit s3c2410_serial_exit(void)

{

	platform_driver_unregister(&s3c2410_serial_drv);

	platform_driver_unregister(&s3c2410_serial_driver);

}



module_init(s3c2410_serial_init);

drivers/serial/s3c2412.c

+4 −4
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ static int s3c2412_serial_probe(struct platform_device *dev) 
	return s3c24xx_serial_probe(dev, &s3c2412_uart_inf);

}



static struct platform_driver s3c2412_serial_drv = {

static struct platform_driver s3c2412_serial_driver = {

	.probe		= s3c2412_serial_probe,

	.remove		= __devexit_p(s3c24xx_serial_remove),

	.driver		= {
@@ -130,16 +130,16 @@ static struct platform_driver s3c2412_serial_drv = { 
	},

};



s3c24xx_console_init(&s3c2412_serial_drv, &s3c2412_uart_inf);

s3c24xx_console_init(&s3c2412_serial_driver, &s3c2412_uart_inf);



static inline int s3c2412_serial_init(void)

{

	return s3c24xx_serial_init(&s3c2412_serial_drv, &s3c2412_uart_inf);

	return s3c24xx_serial_init(&s3c2412_serial_driver, &s3c2412_uart_inf);

}



static inline void s3c2412_serial_exit(void)

{

	platform_driver_unregister(&s3c2412_serial_drv);

	platform_driver_unregister(&s3c2412_serial_driver);

}



module_init(s3c2412_serial_init);

drivers/serial/s3c2440.c

+4 −4
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ static int s3c2440_serial_probe(struct platform_device *dev) 
	return s3c24xx_serial_probe(dev, &s3c2440_uart_inf);

}



static struct platform_driver s3c2440_serial_drv = {

static struct platform_driver s3c2440_serial_driver = {

	.probe		= s3c2440_serial_probe,

	.remove		= __devexit_p(s3c24xx_serial_remove),

	.driver		= {
@@ -160,16 +160,16 @@ static struct platform_driver s3c2440_serial_drv = { 
	},

};



s3c24xx_console_init(&s3c2440_serial_drv, &s3c2440_uart_inf);

s3c24xx_console_init(&s3c2440_serial_driver, &s3c2440_uart_inf);



static int __init s3c2440_serial_init(void)

{

	return s3c24xx_serial_init(&s3c2440_serial_drv, &s3c2440_uart_inf);

	return s3c24xx_serial_init(&s3c2440_serial_driver, &s3c2440_uart_inf);

}



static void __exit s3c2440_serial_exit(void)

{

	platform_driver_unregister(&s3c2440_serial_drv);

	platform_driver_unregister(&s3c2440_serial_driver);

}



module_init(s3c2440_serial_init);