diff options
| author | Arnd Bergmann | 2013-06-20 15:28:52 +0200 |
|---|---|---|
| committer | Arnd Bergmann | 2013-06-20 15:28:52 +0200 |
| commit | 412bb1c1d5cc7790cf048f7b019caca3bce2fb39 (patch) | |
| tree | 8fdbbd080b44a8946cd967f3d42287bff29b980d | |
| parent | 359d786b0402bac88d5bd6ad5a02c2a773f1b9f9 (diff) | |
| parent | 4b83f75a7af388aaf5f79ccf72c37074bc9166da (diff) | |
Merge branch 'picoxcell-next' of git://github.com/jamieiles/linux-2.6-ji into next/cleanup
From Jamie Iles:
* 'picoxcell-next' of git://github.com/jamieiles/linux-2.6-ji:
ARM: picoxcell: Remove init_irq declaration in machine description
picoxcell: remove redundant common.h
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm/mach-picoxcell/common.c | 7 | ||||
| -rw-r--r-- | arch/arm/mach-picoxcell/common.h | 17 |
2 files changed, 0 insertions, 24 deletions
diff --git a/arch/arm/mach-picoxcell/common.c b/arch/arm/mach-picoxcell/common.c index 70b441ad1d18..b069fa6bb0e2 100644 --- a/arch/arm/mach-picoxcell/common.c +++ b/arch/arm/mach-picoxcell/common.c @@ -8,20 +8,14 @@ * All enquiries to support@picochip.com */ #include <linux/delay.h> -#include <linux/irq.h> -#include <linux/irqchip.h> -#include <linux/irqdomain.h> #include <linux/of.h> #include <linux/of_address.h> -#include <linux/of_irq.h> #include <linux/of_platform.h> #include <linux/dw_apb_timer.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include "common.h" - #define PHYS_TO_IO(x) (((x) & 0x00ffffff) | 0xfe000000) #define PICOXCELL_PERIPH_BASE 0x80000000 #define PICOXCELL_PERIPH_LENGTH SZ_4M @@ -87,7 +81,6 @@ static void picoxcell_wdt_restart(char mode, const char *cmd) DT_MACHINE_START(PICOXCELL, "Picochip picoXcell") .map_io = picoxcell_map_io, .nr_irqs = NR_IRQS_LEGACY, - .init_irq = irqchip_init, .init_time = dw_apb_timer_init, .init_machine = picoxcell_init_machine, .dt_compat = picoxcell_dt_match, diff --git a/arch/arm/mach-picoxcell/common.h b/arch/arm/mach-picoxcell/common.h deleted file mode 100644 index 481b42a4ef15..000000000000 --- a/arch/arm/mach-picoxcell/common.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) 2011 Picochip Ltd., Jamie Iles - * - * 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. - * - * All enquiries to support@picochip.com - */ -#ifndef __PICOXCELL_COMMON_H__ -#define __PICOXCELL_COMMON_H__ - -#include <asm/mach/time.h> - -extern void dw_apb_timer_init(void); - -#endif /* __PICOXCELL_COMMON_H__ */ |