Merge master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream into devel

This commit is contained in:
Russell King 2006-09-27 19:57:54 +01:00 • committed by Russell King
commit 2dc94310bd
1923 changed files with 174961 additions and 66865 deletions

View file

@ -207,7 +207,8 @@ static int i2c_powermac_probe(struct device *dev)
struct pmac_i2c_bus *bus = dev->platform_data;
struct device_node *parent = NULL;
struct i2c_adapter *adapter;
char name[32], *basename;
char name[32];
const char *basename;
int rc;
if (bus == NULL)