merge of '82673acfb73d52fea0af1765fcc388e06da120fe'

     and 'b37044d8c845daa30d482ff54744391de3b55387'

1 files changed, 0 insertions, 86 deletions

diff --git a/packages/linux/linux-omap2-git/beagleboard/5-omap3evm-header.patch b/packages/linux/linux-omap2-git/beagleboard/5-omap3evm-header.patch
deleted file mode 100644
index 00fd482601..0000000000
--- a/packages/linux/linux-omap2-git/beagleboard/5-omap3evm-header.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-
-Added new board header file for OMAP3 EVM
-
-Signed-off-by: Syed Mohammed Khasim <khasim@ti.com>
----
- include/asm-arm/arch-omap/board-omap3evm.h |   53 +++++++++++++++++++++++++++++
- include/asm-arm/arch-omap/hardware.h       |    4 ++
- 2 files changed, 57 insertions(+)
-
-Index: my_branch/include/asm-arm/arch-omap/hardware.h
-===================================================================
---- my_branch.orig/include/asm-arm/arch-omap/hardware.h	2008-04-16 14:39:51.000000000 +0530
-+++ my_branch/include/asm-arm/arch-omap/hardware.h	2008-04-16 14:44:09.000000000 +0530
-@@ -335,6 +335,10 @@
- #include "board-3430sdp.h"
- #endif
- 
-+#ifdef CONFIG_MACH_OMAP3EVM
-+#include "board-omap3evm.h"
-+#endif
-+
- #ifdef CONFIG_MACH_OMAP_APOLLON
- #include "board-apollon.h"
- #endif
-Index: my_branch/include/asm-arm/arch-omap/board-omap3evm.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ my_branch/include/asm-arm/arch-omap/board-omap3evm.h	2008-04-16 14:44:09.000000000 +0530
-@@ -0,0 +1,53 @@
-+/*
-+ * linux/include/asm-arm/arch-omap/board-omap3evm.h
-+ *
-+ * Hardware definitions for TI OMAP3 EVM.
-+ *
-+ * Initial creation by Syed Mohammed Khasim <khasim@ti.com>
-+ *
-+ * 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 SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
-+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
-+ * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ * 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.,
-+ * 675 Mass Ave, Cambridge, MA 02139, USA.
-+ */
-+
-+#ifndef __ASM_ARCH_OMAP3_EVM_H
-+#define __ASM_ARCH_OMAP3_EVM_H
-+
-+#ifdef CONFIG_TWL4030_CORE
-+
-+#define TWL4030_IRQNUM		INT_34XX_SYS_NIRQ
-+
-+/* TWL4030 Primary Interrupt Handler (PIH) interrupts */
-+#define	IH_TWL4030_BASE		IH_BOARD_BASE
-+#define	IH_TWL4030_END		(IH_TWL4030_BASE+8)
-+#define IH_TWL4030_PWRBASE	(IH_TWL4030_END)
-+#define IH_TWL4030_PWRBASE_END	(IH_TWL4030_PWRBASE+8)
-+
-+#ifdef CONFIG_TWL4030_GPIO
-+/* TWL4030 GPIO Interrupts */
-+#define IH_TWL4030_GPIO_BASE	(IH_TWL4030_PWRBASE_END)
-+#define IH_TWL4030_GPIO_END	(IH_TWL4030_GPIO_BASE+18)
-+#define NR_IRQS			(IH_TWL4030_GPIO_END)
-+#else
-+#define NR_IRQS			(IH_TWL4030_PWRBASE_END)
-+#endif /* CONFIG_I2C_TWL4030_GPIO */
-+
-+#endif /* End of support for TWL4030 */
-+#endif /*  __ASM_ARCH_OMAP3_EVM_H */
-+
---
-To unsubscribe from this list: send the line "unsubscribe linux-omap" in
-the body of a message to majordomo@vger.kernel.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
\ No newline at end of file