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

Merge branch 'devel-stable' into devel

Browse Source 
Conflicts:
	MAINTAINERS
	arch/arm/mm/fault.c
This commit is contained in:
Russell King
2009-09-12 12:02:26 +01:00
committed by Russell King
parent cf7a2b4fb6 f17a1f06d2
commit ddd559b13f
1300 changed files with 48030 additions and 17983 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/mach-versatile/core.c
View File

@@ -343,8 +343,7 @@ static struct platform_device versatile_i2c_device = {
static struct i2c_board_info versatile_i2c_board_info[] = {
{
I2C_BOARD_INFO("rtc-ds1307", 0xd0 >> 1),
.type = "ds1338",
I2C_BOARD_INFO("ds1338", 0xd0 >> 1),
},
};