diff options
| author | Olof Johansson <olof@lixom.net> | 2012-03-10 08:52:45 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-03-10 08:52:45 -0800 |
| commit | 708795cd975579ba7115666f585c428f8cebd572 (patch) | |
| tree | 5d497486f317ea95edb998825a900d01aff667a0 /arch/arm/mach-bcmring/include/mach/io.h | |
| parent | d50673ed97a7ce609cf62bcd40c57517ada31806 (diff) | |
| parent | 5621caac1d9514b568f986b55ce5494b1d119d40 (diff) | |
| download | linux-708795cd975579ba7115666f585c428f8cebd572.tar.gz linux-708795cd975579ba7115666f585c428f8cebd572.tar.bz2 linux-708795cd975579ba7115666f585c428f8cebd572.zip | |
Merge branch 'io-cleanup-for-3.4' of git://sources.calxeda.com/kernel/linux into next/cleanup2
* 'io-cleanup-for-3.4' of git://sources.calxeda.com/kernel/linux: (22 commits)
ARM: kill off __mem_pci
ARM: remove bunch of now unused mach/io.h files
ARM: make mach/io.h include optional
ARM: clps711x: remove unneeded include of mach/io.h
ARM: dove: add explicit include of dove.h to addr-map.c
ARM: at91: add explicit include of hardware.h to uncompressor
ARM: ep93xx: clean-up mach/io.h
ARM: tegra: clean-up mach/io.h
ARM: orion5x: clean-up mach/io.h
ARM: davinci: remove unneeded mach/io.h include
[media] davinci: remove includes of mach/io.h
ARM: OMAP: Remove remaining includes for mach/io.h
ARM: msm: clean-up mach/io.h
ARM: iop13xx: move io.h externs to pci.h
ARM: remove compile time __arch_ioremap/__arch_iounmap
ARM: ebsa110: use runtime ioremap hook
ARM: ixp4xx: use runtime ioremap hook
ARM: iop13xx: use runtime ioremap hook
ARM: msm: use runtime ioremap hook
ARM: imx: convert to common runtime ioremap hook
...
Diffstat (limited to 'arch/arm/mach-bcmring/include/mach/io.h')
| -rw-r--r-- | arch/arm/mach-bcmring/include/mach/io.h | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/arch/arm/mach-bcmring/include/mach/io.h b/arch/arm/mach-bcmring/include/mach/io.h deleted file mode 100644 index dae5e9b166ea..000000000000 --- a/arch/arm/mach-bcmring/include/mach/io.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * - * Copyright (C) 1999 ARM Limited - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -#ifndef __ASM_ARM_ARCH_IO_H -#define __ASM_ARM_ARCH_IO_H - -#include <mach/hardware.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 |