[PATCH] Recent i2c changes broke matroxfb

The 'name' member of i2c clients & adapters moved again back to the
i2c_* from generic device.

Thanks to Petri Koistinen for bringing this to my attention.

drivers/video/matrox/i2c-matroxfb.c

@@ -111,7 +111,7 @@ static int i2c_bus_reg(struct i2c_bit_adapter* b, struct matrox_fb_info* minfo,
 	b->mask.data = data;
 	b->mask.clock = clock;
 	b->adapter = matrox_i2c_adapter_template;
-	snprintf(b->adapter.dev.name, DEVICE_NAME_SIZE, name,
+	snprintf(b->adapter.name, DEVICE_NAME_SIZE, name,
 		minfo->fbcon.node);
 	i2c_set_adapdata(&b->adapter, b);
 	b->adapter.algo_data = &b->bac;

drivers/video/matrox/matroxfb_maven.c

@@ -1255,7 +1255,7 @@ static int maven_detect_client(struct i2c_adapter* adapter, int address, int kin
 	new_client->adapter = adapter;
 	new_client->driver = &maven_driver;
 	new_client->flags = 0;
-	strcpy(new_client->dev.name, "maven client");
+	strcpy(new_client->name, "maven client");
 	if ((err = i2c_attach_client(new_client)))
 		goto ERROR3;
 	err = maven_init_client(new_client);