summaryrefslogtreecommitdiff
path: root/arch/arm/mach-sa1100/include
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-10-05 02:01:28 +0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-10-05 02:01:28 +0400
commit43a60c1792b13eed49220af0e1344bf48e3a0677 (patch)
treecdacc16876e95df8a4ee7a554d267407ec0cb808 /arch/arm/mach-sa1100/include
parent0d7614f09c1ebdbaa1599a5aba7593f147bf96ee (diff)
parent9fc31ddc70ac594b5a1d8a83303b65008221088c (diff)
downloadlinux-43a60c1792b13eed49220af0e1344bf48e3a0677.tar.xz
Merge branch 'cleanup' into for-linus
Conflicts: arch/arm/mach-imx/mach-imx27_visstrim_m10.c
Diffstat (limited to 'arch/arm/mach-sa1100/include')
-rw-r--r--arch/arm/mach-sa1100/include/mach/SA-1111.h5
-rw-r--r--arch/arm/mach-sa1100/include/mach/lart.h13
2 files changed, 0 insertions, 18 deletions
diff --git a/arch/arm/mach-sa1100/include/mach/SA-1111.h b/arch/arm/mach-sa1100/include/mach/SA-1111.h
deleted file mode 100644
index c38f60915cb6..000000000000
--- a/arch/arm/mach-sa1100/include/mach/SA-1111.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
- * Moved to new location
- */
-#warning using old SA-1111.h - update to <asm/hardware/sa1111.h>
-#include <asm/hardware/sa1111.h>
diff --git a/arch/arm/mach-sa1100/include/mach/lart.h b/arch/arm/mach-sa1100/include/mach/lart.h
deleted file mode 100644
index 8a5482d908db..000000000000
--- a/arch/arm/mach-sa1100/include/mach/lart.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef _INCLUDE_LART_H
-#define _INCLUDE_LART_H
-
-#define LART_GPIO_ETH0 GPIO_GPIO0
-#define LART_IRQ_ETH0 IRQ_GPIO0
-
-#define LART_GPIO_IDE GPIO_GPIO1
-#define LART_IRQ_IDE IRQ_GPIO1
-
-#define LART_GPIO_UCB1200 GPIO_GPIO18
-#define LART_IRQ_UCB1200 IRQ_GPIO18
-
-#endif