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

Merge branch 'master' of git://git.marvell.com/orion into devel

Browse Source 
Conflicts:

	arch/arm/mach-mx1/devices.c
This commit is contained in:
Russell King
2009-03-19 23:10:40 +00:00
committed by Russell King
parent be093beb60 569106c70e
commit 7d83f8fca5
55 changed files with 1735 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/plat-omap/include/mach/common.h
View File

@@ -35,7 +35,7 @@ extern void omap_map_common_io(void);
extern struct sys_timer omap_timer;
extern void omap_serial_init(void);
extern void omap_serial_enable_clocks(int enable);
#ifdef CONFIG_I2C_OMAP
#if defined(CONFIG_I2C_OMAP) || defined(CONFIG_I2C_OMAP_MODULE)
extern int omap_register_i2c_bus(int bus_id, u32 clkrate,
struct i2c_board_info const *info,
unsigned len);