lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'next/fixes' into next/cleanup

Browse Source 
Conflicts:
	arch/arm/mach-mxs/include/mach/gpio.h
	arch/arm/plat-mxc/include/mach/gpio.h
	drivers/video/omap/lcd_apollon.c
	drivers/video/omap/lcd_ldp.c
	drivers/video/omap/lcd_overo.c
This commit is contained in:
Arnd Bergmann
2011-10-31 23:25:41 +01:00
parent 034ee29912 5839fec9d8
commit 3e965b1763
415 changed files with 2399 additions and 3069 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/mmc/host/omap.c
View File

@@ -33,7 +33,7 @@
#include <plat/board.h>
#include <plat/mmc.h>
#include <mach/gpio.h>
#include <asm/gpio.h>
#include <plat/dma.h>
#include <plat/mux.h>
#include <plat/fpga.h>

4
drivers/mmc/host/sdhci-tegra.c
View File

@@ -21,7 +21,9 @@
#include <linux/mmc/card.h>
#include <linux/mmc/host.h>
#include <mach/gpio.h>
#include <asm/gpio.h>
#include <mach/gpio-tegra.h>
#include <mach/sdhci.h>
#include "sdhci-pltfm.h"