Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94c65785 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'omap-for-v3.8/cleanup-headers-dma' into omap-for-v3.8/cleanup-headers 

Conflicts:
	drivers/crypto/omap-aes.c
	drivers/crypto/omap-sham.c
	drivers/dma/omap-dma.c
parents 27615a97 2b6c4e73

arch/arm/mach-omap1/board-h2.c

+2 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
#include <asm/mach/map.h>



#include <mach/mux.h>

#include <plat/dma.h>

#include <plat-omap/dma-omap.h>

#include <plat/tc.h>

#include <mach/irda.h>

#include <linux/platform_data/keypad-omap.h>
@@ -50,6 +50,7 @@ 


#include "common.h"

#include "board-h2.h"

#include "dma.h"



/* At OMAP1610 Innovator the Ethernet is directly connected to CS1 */

#define OMAP1610_ETHR_START		0x04000300

arch/arm/mach-omap1/board-h3.c

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
#include <mach/mux.h>

#include <plat/tc.h>

#include <linux/platform_data/keypad-omap.h>

#include <plat/dma.h>

#include <plat-omap/dma-omap.h>

#include <mach/flash.h>



#include <mach/hardware.h>

arch/arm/mach-omap1/board-palmte.c

+2 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
#include <mach/flash.h>

#include <mach/mux.h>

#include <plat/tc.h>

#include <plat/dma.h>

#include <plat-omap/dma-omap.h>

#include <mach/irda.h>

#include <linux/platform_data/keypad-omap.h>
@@ -45,6 +45,7 @@ 
#include <mach/usb.h>



#include "common.h"

#include "dma.h"



#define PALMTE_USBDETECT_GPIO	0

#define PALMTE_USB_OR_DC_GPIO	1

arch/arm/mach-omap1/board-palmtt.c

+2 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#include <plat/led.h>

#include <mach/flash.h>

#include <mach/mux.h>

#include <plat/dma.h>

#include <plat-omap/dma-omap.h>

#include <plat/tc.h>

#include <mach/irda.h>

#include <linux/platform_data/keypad-omap.h>
@@ -45,6 +45,7 @@ 
#include <mach/usb.h>



#include "common.h"

#include "dma.h"



#define PALMTT_USBDETECT_GPIO	0

#define PALMTT_CABLE_GPIO	1

arch/arm/mach-omap1/board-palmz71.c

+2 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 


#include <mach/flash.h>

#include <mach/mux.h>

#include <plat/dma.h>

#include <plat-omap/dma-omap.h>

#include <plat/tc.h>

#include <mach/irda.h>

#include <linux/platform_data/keypad-omap.h>
@@ -47,6 +47,7 @@ 
#include <mach/usb.h>



#include "common.h"

#include "dma.h"



#define PALMZ71_USBDETECT_GPIO	0

#define PALMZ71_PENIRQ_GPIO	6