A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 03:01:39 -04:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
This sorts out merge conflicts with the arm/gpio branch that
already got merged into mainline Linux.

Signed-off-by: Arnd Bergmann <[email protected]>
This commit is contained in:
Arnd Bergmann 2011-10-31 22:44:18 +01:00
commit 43872fa788
256 changed files with 1660 additions and 1734 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"