diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-07-14 15:23:19 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2016-07-14 15:23:19 +0200 |
commit | f1844aca29025bb436bfc4f872456b832632df56 (patch) | |
tree | a9df7248ed8595db2f3313ea2e016cf19757eca4 /include/linux/platform_data | |
parent | cf1d9dd447935bd90d42ee349c1da2498cff8775 (diff) | |
parent | a16729ea822806a6f87415bcb523eaeb7f4b4ebd (diff) | |
download | linux-0-day-f1844aca29025bb436bfc4f872456b832632df56.tar.gz linux-0-day-f1844aca29025bb436bfc4f872456b832632df56.tar.xz |
Merge tag 'ux500-cleanup-bundle' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/drivers
Merge "Ux500 cleanups from Arnd" from Linus Walleij:
This is a set of cleanups for the Ux500 that reduce the number
of machine-local files and boardfile-type data for regulators
and ASoC.
* tag 'ux500-cleanup-bundle' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
ARM: ux500: consolidate base platform files
ARM: ux500: move soc_id driver to drivers/soc
ARM: ux500: call ux500_setup_id later
ARM: ux500: consolidate soc_device code in id.c
ARM: ux500: remove cpu_is_u* helpers
ARM: ux500: use CLK_OF_DECLARE()
ARM: ux500: move l2x0 init to .init_irq
mfd: db8500 stop passing around platform data
ASoC: ab8500-codec: remove platform data based probe
ARM: ux500: move ab8500_regulator_plat_data into driver
ARM: ux500: remove unused regulator data
Diffstat (limited to 'include/linux/platform_data')
-rw-r--r-- | include/linux/platform_data/clk-ux500.h | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/include/linux/platform_data/clk-ux500.h b/include/linux/platform_data/clk-ux500.h deleted file mode 100644 index 3af0da1f3be58..0000000000000 --- a/include/linux/platform_data/clk-ux500.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Clock definitions for ux500 platforms - * - * Copyright (C) 2012 ST-Ericsson SA - * Author: Ulf Hansson <ulf.hansson@linaro.org> - * - * License terms: GNU General Public License (GPL) version 2 - */ - -#ifndef __CLK_UX500_H -#define __CLK_UX500_H - -void u8500_clk_init(void); -void u9540_clk_init(void); -void u8540_clk_init(void); - -#endif /* __CLK_UX500_H */ |