tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

MIPS: Alchemy: kill au1xxx.h header

No longer required

Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com>
To: Linux-MIPS <linux-mips@linux-mips.org>
Patchwork: https://patchwork.linux-mips.org/patch/2705/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

delete mode 100644 arch/mips/include/asm/mach-au1x00/au1xxx.h

authored by

Manuel Lauss and committed by
Ralf Baechle 50d5676e f2e442fd

+11 -49
+1 -1
arch/mips/alchemy/common/platform.c
··· 18 18 #include <linux/serial_8250.h> 19 19 #include <linux/slab.h> 20 20 21 - #include <asm/mach-au1x00/au1xxx.h> 21 + #include <asm/mach-au1x00/au1000.h> 22 22 #include <asm/mach-au1x00/au1xxx_dbdma.h> 23 23 #include <asm/mach-au1x00/au1100_mmc.h> 24 24 #include <asm/mach-au1x00/au1xxx_eth.h>
+1 -1
arch/mips/alchemy/devboards/db1x00/platform.c
··· 21 21 #include <linux/init.h> 22 22 #include <linux/platform_device.h> 23 23 24 - #include <asm/mach-au1x00/au1xxx.h> 24 + #include <asm/mach-au1x00/au1000.h> 25 25 #include <asm/mach-db1x00/bcsr.h> 26 26 #include "../platform.h" 27 27
+2 -1
arch/mips/alchemy/devboards/pb1200/platform.c
··· 24 24 #include <linux/platform_device.h> 25 25 #include <linux/smc91x.h> 26 26 27 - #include <asm/mach-au1x00/au1xxx.h> 27 + #include <asm/mach-au1x00/au1000.h> 28 28 #include <asm/mach-au1x00/au1100_mmc.h> 29 29 #include <asm/mach-au1x00/au1xxx_dbdma.h> 30 30 #include <asm/mach-db1x00/bcsr.h> 31 + #include <asm/mach-pb1x00/pb1200.h> 31 32 32 33 #include "../platform.h" 33 34
-43
arch/mips/include/asm/mach-au1x00/au1xxx.h
··· 1 - /* 2 - * This program is free software; you can redistribute it and/or modify it 3 - * under the terms of the GNU General Public License as published by the 4 - * Free Software Foundation; either version 2 of the License, or (at your 5 - * option) any later version. 6 - * 7 - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED 8 - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 9 - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN 10 - * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 11 - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 12 - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 13 - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 14 - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 15 - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 16 - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 17 - * 18 - * You should have received a copy of the GNU General Public License along 19 - * with this program; if not, write to the Free Software Foundation, Inc., 20 - * 675 Mass Ave, Cambridge, MA 02139, USA. 21 - */ 22 - 23 - #ifndef _AU1XXX_H_ 24 - #define _AU1XXX_H_ 25 - 26 - #include <asm/mach-au1x00/au1000.h> 27 - 28 - #if defined(CONFIG_MIPS_DB1000) || defined(CONFIG_MIPS_DB1100) || \ 29 - defined(CONFIG_MIPS_DB1500) || defined(CONFIG_MIPS_DB1550) 30 - #include <asm/mach-db1x00/db1x00.h> 31 - 32 - #elif defined(CONFIG_MIPS_PB1550) 33 - #include <asm/mach-pb1x00/pb1550.h> 34 - 35 - #elif defined(CONFIG_MIPS_PB1200) 36 - #include <asm/mach-pb1x00/pb1200.h> 37 - 38 - #elif defined(CONFIG_MIPS_DB1200) 39 - #include <asm/mach-db1x00/db1200.h> 40 - 41 - #endif 42 - 43 - #endif /* _AU1XXX_H_ */
+1 -1
drivers/i2c/busses/i2c-au1550.c
··· 36 36 #include <linux/i2c.h> 37 37 #include <linux/slab.h> 38 38 39 - #include <asm/mach-au1x00/au1xxx.h> 39 + #include <asm/mach-au1x00/au1000.h> 40 40 #include <asm/mach-au1x00/au1xxx_psc.h> 41 41 42 42 struct i2c_au1550_data {
+1 -1
drivers/ide/au1xxx-ide.c
··· 36 36 #include <linux/ide.h> 37 37 #include <linux/scatterlist.h> 38 38 39 - #include <asm/mach-au1x00/au1xxx.h> 39 + #include <asm/mach-au1x00/au1000.h> 40 40 #include <asm/mach-au1x00/au1xxx_dbdma.h> 41 41 #include <asm/mach-au1x00/au1xxx_ide.h> 42 42
+5 -1
drivers/mtd/nand/au1550nd.c
··· 19 19 #include <linux/mtd/partitions.h> 20 20 #include <asm/io.h> 21 21 22 - #include <asm/mach-au1x00/au1xxx.h> 22 + #ifdef CONFIG_MIPS_PB1550 23 + #include <asm/mach-pb1x00/pb1550.h> 24 + #elif defined(CONFIG_MIPS_DB1550) 25 + #include <asm/mach-db1x00/db1x00.h> 26 + #endif 23 27 #include <asm/mach-db1x00/bcsr.h> 24 28 25 29 /*