Merge branch 'linus' into cpus4096

Conflicts:

	arch/x86/xen/smp.c
	kernel/sched_rt.c
	net/iucv/iucv.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 48 insertions, 0 deletions

diff --git a/arch/avr32/mach-at32ap/pdc.c b/arch/avr32/mach-at32ap/pdc.c
new file mode 100644
index 000000000000..1040bda4fda7
--- /dev/null
+++ b/arch/avr32/mach-at32ap/pdc.c
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2006 Atmel Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/clk.h>
+#include <linux/err.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+
+static int __init pdc_probe(struct platform_device *pdev)
+{
+        struct clk *pclk, *hclk;
+
+        pclk = clk_get(&pdev->dev, "pclk");
+        if (IS_ERR(pclk)) {
+                dev_err(&pdev->dev, "no pclk defined\n");
+                return PTR_ERR(pclk);
+        }
+        hclk = clk_get(&pdev->dev, "hclk");
+        if (IS_ERR(hclk)) {
+                dev_err(&pdev->dev, "no hclk defined\n");
+                clk_put(pclk);
+                return PTR_ERR(hclk);
+        }
+
+        clk_enable(pclk);
+        clk_enable(hclk);
+
+        dev_info(&pdev->dev, "Atmel Peripheral DMA Controller enabled\n");
+        return 0;
+}
+
+static struct platform_driver pdc_driver = {
+        .probe          = pdc_probe,
+        .driver         = {
+                .name   = "pdc",
+        },
+};
+
+static int __init pdc_init(void)
+{
+        return platform_driver_register(&pdc_driver);
+}
+arch_initcall(pdc_init);