diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-01-07 11:51:28 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-07 11:51:28 +0000 |
| commit | 40ba95fdf158713377d47736b1b3a9d75f4f2515 (patch) | |
| tree | 17a3216542d1107f777fd82577c91aebbce597d6 /arch/arm/plat-tcc/include/mach/io.h | |
| parent | 70d84a6431d732cbc4e68e72b6890cdd3865d43d (diff) | |
| parent | 0575fb754dbfc32a01f297e778533340a533ec68 (diff) | |
| download | talos-obmc-linux-40ba95fdf158713377d47736b1b3a9d75f4f2515.tar.gz talos-obmc-linux-40ba95fdf158713377d47736b1b3a9d75f4f2515.zip | |
Merge branch 'depends/rmk/restart' into next/cleanup
Conflicts:
arch/arm/mach-at91/at91cap9.c
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9261.c
arch/arm/mach-at91/at91sam9263.c
arch/arm/mach-at91/at91sam9g45.c
arch/arm/mach-at91/at91sam9rl.c
arch/arm/mach-exynos/cpu.c
arch/arm/mach-shmobile/board-kota2.c
This resolves a bunch of conflicts between the arm-soc tree
and changes from the arm tree that have gone upstream.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/plat-tcc/include/mach/io.h')
| -rw-r--r-- | arch/arm/plat-tcc/include/mach/io.h | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/arch/arm/plat-tcc/include/mach/io.h b/arch/arm/plat-tcc/include/mach/io.h deleted file mode 100644 index 3e911d3ea0f1..000000000000 --- a/arch/arm/plat-tcc/include/mach/io.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * IO definitions for TCC8000 processors and boards - * - * Copyright (C) 1997-1999 Russell King - * Copyright (C) 2008-2009 Telechips - * Copyright (C) 2010 Hans J. Koch <hjk@linutronix.de> - * - * Licensed under the terms of the GNU Public License version 2. - */ - -#ifndef __ASM_ARM_ARCH_IO_H -#define __ASM_ARM_ARCH_IO_H - -#define IO_SPACE_LIMIT 0xffffffff - -/* - * We don't actually have real ISA nor PCI buses, but there is so many - * drivers out there that might just work if we fake them... - */ -#define __io(a) __typesafe_io(a) -#define __mem_pci(a) (a) - -#endif |
