xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 7xx-iosplit-plat-merge with omap-fixes

Browse Source 
Merge branch '7xx-iosplit-plat-merge' into omap-for-linus
This commit is contained in:
Tony Lindgren
2009-11-22 10:08:43 -08:00
parent 648f4e3e50 8171d88089
commit a76df42a67
272 changed files with 3838 additions and 1654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,12 +30,12 @@
#include <asm/io.h>
#include <asm/irq.h>
#include <mach/board.h>
#include <mach/mmc.h>
#include <plat/board.h>
#include <plat/mmc.h>
#include <mach/gpio.h>
#include <mach/dma.h>
#include <mach/mux.h>
#include <mach/fpga.h>
#include <plat/dma.h>
#include <plat/mux.h>
#include <plat/fpga.h>
#define OMAP_MMC_REG_CMD 0x00
#define OMAP_MMC_REG_ARGL 0x04

8
drivers/mmc/host/omap_hsmmc.c
View File

@@ -30,11 +30,11 @@
#include <linux/mmc/core.h>
#include <linux/io.h>
#include <linux/semaphore.h>
#include <mach/dma.h>
#include <plat/dma.h>
#include <mach/hardware.h>
#include <mach/board.h>
#include <mach/mmc.h>
#include <mach/cpu.h>
#include <plat/board.h>
#include <plat/mmc.h>
#include <plat/cpu.h>
/* OMAP HSMMC Host Controller Registers */
#define OMAP_HSMMC_SYSCONFIG 0x0010