Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	net/mac80211/mlme.c

1 files changed, 25 insertions, 0 deletions

diff --git a/arch/arm/mach-pxa/clock.c b/arch/arm/mach-pxa/clock.c
index c01eea88f787..ca8e20538157 100644
--- a/arch/arm/mach-pxa/clock.c
+++ b/arch/arm/mach-pxa/clock.c
@@ -125,3 +125,28 @@ void clks_register(struct clk *clks, size_t num)
                 list_add(&clks[i].node, &clocks);
         mutex_unlock(&clocks_mutex);
 }
+
+int clk_add_alias(char *alias, struct device *alias_dev, char *id,
+        struct device *dev)
+{
+        struct clk *r = clk_lookup(dev, id);
+        struct clk *new;
+
+        if (!r)
+                return -ENODEV;
+
+        new = kzalloc(sizeof(struct clk), GFP_KERNEL);
+
+        if (!new)
+                return -ENOMEM;
+
+        new->name = alias;
+        new->dev = alias_dev;
+        new->other = r;
+
+        mutex_lock(&clocks_mutex);
+        list_add(&new->node, &clocks);
+        mutex_unlock(&clocks_mutex);
+
+        return 0;
+}