git/linux-net
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git/ synced 2026-04-24 19:25:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'merge'

Browse Source 
Conflicts:

	arch/powerpc/sysdev/fsl_soc.c
This commit is contained in:
Paul Mackerras
2008-06-09 12:19:41 +10:00
parent e026892c85 60d5019be8
commit 8a3e1c670e
683 changed files with 10686 additions and 5258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/sysdev/fsl_soc.c
View File

@@ -432,7 +432,7 @@ static struct i2c_driver_device i2c_devices[] __initdata = {
{"dallas,ds1339", "ds1339"},
{"dallas,ds1340", "ds1340"},
{"stm,m41t00", "m41t00"},
{"dallas,ds1374", "rtc-ds1374"},
{"dallas,ds1374", "ds1374"},
{"cirrus,cs4270", "cs4270"},
};