diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-06 10:58:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-06 10:58:34 -0700 |
| commit | 5872c84027fdcc982e8109ca26d11e1117995745 (patch) | |
| tree | f4b59f792a24526c0d2f1ffe3fa8d743b5693f1d /arch/microblaze/kernel/setup.c | |
| parent | 39eda2aba6be642b71f2e0ad623dcb09fd9d79cf (diff) | |
| parent | 54ea21f0785fd01fb3279d42fe6670cef64cf648 (diff) | |
Merge tag 'microblaze-3.12-rc1' of git://git.monstr.eu/linux-2.6-microblaze
Pull Microblaze patches from Michal Simek:
- PCI fixes
- Selfmod code removing
- Intc and timer fixes
- Adding new MB versions
- Minor fixes
* tag 'microblaze-3.12-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: Show message when reset gpio is not present
microblaze: Add linux.bin.ub target
microblaze: Add PVR version string for MB v9.0 and v9.1
microblaze: timer: Replace microblaze_ prefix by xilinx_
microblaze: timer: Update header
microblaze: timer: Remove unused header
microblaze: timer: Clear driver init function
microblaze: timer: Use CLKSRC_OF initialization
microblaze: intc: Remove unused header
microblaze: intc: Clean driver init function
microblaze: intc: Using irqchip
microblaze: intc: Update header
microblaze: intc: Remove unused headers
microblaze: Remove selfmodified feature
of/pci: Use of_pci_range_parser
Diffstat (limited to 'arch/microblaze/kernel/setup.c')
| -rw-r--r-- | arch/microblaze/kernel/setup.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/microblaze/kernel/setup.c b/arch/microblaze/kernel/setup.c index 0263da7b83d..0775e036c52 100644 --- a/arch/microblaze/kernel/setup.c +++ b/arch/microblaze/kernel/setup.c @@ -9,6 +9,7 @@ */ #include <linux/init.h> +#include <linux/clocksource.h> #include <linux/string.h> #include <linux/seq_file.h> #include <linux/cpu.h> @@ -68,10 +69,6 @@ void __init setup_arch(char **cmdline_p) xilinx_pci_init(); -#if defined(CONFIG_SELFMOD_INTC) || defined(CONFIG_SELFMOD_TIMER) - pr_notice("Self modified code enable\n"); -#endif - #ifdef CONFIG_VT #if defined(CONFIG_XILINX_CONSOLE) conswitchp = &xil_con; @@ -196,6 +193,11 @@ void __init machine_early_init(const char *cmdline, unsigned int ram, per_cpu(CURRENT_SAVE, 0) = (unsigned long)current; } +void __init time_init(void) +{ + clocksource_of_init(); +} + #ifdef CONFIG_DEBUG_FS struct dentry *of_debugfs_root; |