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

Merge branch 'depends/rmk/gpio' into next/devel

Browse Source 
Conflicts:
	arch/arm/mach-mxs/include/mach/gpio.h
	arch/arm/plat-mxc/include/mach/gpio.h

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2011-10-31 23:46:42 +01:00
parent 1075329202 f55be1bf52
commit efa62e1355
256 changed files with 1688 additions and 1811 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"