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

Commit 2a86cb7c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/avr32-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/avr32-2.6:
  avr32: update default configuration files for Atmel boards
  avr32: Convert to clocksource_register_hz
  avr32: make architecture sys_clone prototype match asm-generic prototype
  avr32: use syscall prototypes from asm-generic instead of arch
  avr32: disable kprobes for all default configurations
  avr32: boards: setup: use IS_ERR() instead of NULL check
parents 8a0eebf6 c975ffad

arch/avr32/boards/atngw100/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ static void __init set_hw_addr(struct platform_device *pdev) 
	 */

	regs = (void __iomem __force *)res->start;

	pclk = clk_get(&pdev->dev, "pclk");

	if (!pclk)

	if (IS_ERR(pclk))

		return;



	clk_enable(pclk);

arch/avr32/boards/atstk1000/atstk1002.c

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ static void __init set_hw_addr(struct platform_device *pdev) 
	 */

	regs = (void __iomem __force *)res->start;

	pclk = clk_get(&pdev->dev, "pclk");

	if (!pclk)

	if (IS_ERR(pclk))

		return;



	clk_enable(pclk);

arch/avr32/boards/favr-32/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ static void __init set_hw_addr(struct platform_device *pdev) 
	 */

	regs = (void __iomem __force *)res->start;

	pclk = clk_get(&pdev->dev, "pclk");

	if (!pclk)

	if (IS_ERR(pclk))

		return;



	clk_enable(pclk);

arch/avr32/boards/hammerhead/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ static void __init set_hw_addr(struct platform_device *pdev) 
	regs = (void __iomem __force *)res->start;

	pclk = clk_get(&pdev->dev, "pclk");



	if (!pclk)

	if (IS_ERR(pclk))

		return;



	clk_enable(pclk);

arch/avr32/boards/merisc/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ static void __init set_hw_addr(struct platform_device *pdev) 


	regs = (void __iomem __force *)res->start;

	pclk = clk_get(&pdev->dev, "pclk");

	if (!pclk)

	if (IS_ERR(pclk))

		return;



	clk_enable(pclk);