diff options
| author | Linus Torvalds | 2015-10-28 07:24:53 +0900 |
|---|---|---|
| committer | Linus Torvalds | 2015-10-28 07:24:53 +0900 |
| commit | 23d88271b4f97f66de521ac9b2c1471e6311cf26 (patch) | |
| tree | 631df9436c0c90c10f49263e9d9e9507e77698a7 /drivers | |
| parent | 3d0aa366072a194c6a339d37b85d5b99e936097e (diff) | |
| parent | 625faa6a720d26fc0db9e20b48dc0dfe4c8d8ddf (diff) | |
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King:
"Two fixes for ARM and one for clkdev:
- Fix another build issue with vdsomunge on non-glibc systems
- Fix a randconfig build error caused by an invalid configuration
- Fix a clkdev problem causing the Nokia n700 to no longer boot"
* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
clkdev: fix clk_add_alias() with a NULL alias device name
ARM: 8445/1: fix vdsomunge not to depend on glibc specific byteswap.h
ARM: make RiscPC depend on MMU
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/clk/clkdev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c index c0eaf0973bd2..779b6ff0c7ad 100644 --- a/drivers/clk/clkdev.c +++ b/drivers/clk/clkdev.c @@ -333,7 +333,8 @@ int clk_add_alias(const char *alias, const char *alias_dev_name, if (IS_ERR(r)) return PTR_ERR(r); - l = clkdev_create(r, alias, "%s", alias_dev_name); + l = clkdev_create(r, alias, alias_dev_name ? "%s" : NULL, + alias_dev_name); clk_put(r); return l ? 0 : -ENODEV; |