MIPS: pistachio: remove obsolete include/asm/mach-pistachio

Since commit 02bd530f888c ("MIPS: generic: Increase NR_IRQS to 256")
include/asm/mach-pistachio/irq.h just does nothing.
Remove the file along with mach-pistachio folder and include compiler
directive.

Signed-off-by: Alexander Lobakin <alobakin@pm.me>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>

diff --git a/MAINTAINERS b/MAINTAINERS
index 6add29cb206024a0f4ec0ad00cca2154f2b5b6b8..3e58787907d4548cf1e4c936beb84ea417adab6c 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -14099,7 +14099,6 @@ L:      linux-mips@vger.kernel.org
 S:     Odd Fixes
 F:     arch/mips/boot/dts/img/pistachio*
 F:     arch/mips/configs/pistachio*_defconfig
-F:     arch/mips/include/asm/mach-pistachio/
 F:     arch/mips/pistachio/
 
 PKTCDVD DRIVER

diff --git a/arch/mips/include/asm/mach-pistachio/irq.h b/arch/mips/include/asm/mach-pistachio/irq.h
deleted file mode 100644 (file)
index 74ac016..0000000
--- a/arch/mips/include/asm/mach-pistachio/irq.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Pistachio IRQ setup
- *
- * Copyright (C) 2014 Google, Inc.
- */
-
-#ifndef __ASM_MACH_PISTACHIO_IRQ_H
-#define __ASM_MACH_PISTACHIO_IRQ_H
-
-#define NR_IRQS 256
-
-#include <asm/mach-generic/irq.h>
-
-#endif /* __ASM_MACH_PISTACHIO_IRQ_H */

diff --git a/arch/mips/pistachio/Platform b/arch/mips/pistachio/Platform
index f73a1a929965c3127dfd7ac77f9e3d13a05d2cf8..c59de86dbddfc9c8d77f50e3f2a2743e2b0ea6e0 100644 (file)
--- a/arch/mips/pistachio/Platform
+++ b/arch/mips/pistachio/Platform
@@ -1,8 +1,6 @@
 #
 # IMG Pistachio SoC
 #
-cflags-$(CONFIG_MACH_PISTACHIO)                +=                              \
-               -I$(srctree)/arch/mips/include/asm/mach-pistachio
 load-$(CONFIG_MACH_PISTACHIO)          += 0xffffffff80400000
 zload-$(CONFIG_MACH_PISTACHIO)         += 0xffffffff81000000
 all-$(CONFIG_MACH_PISTACHIO)           := uImage.gz