Merge branch 'master' into next

6 files changed, 15 insertions, 15 deletions

diff --git a/drivers/ata/disk_drive.c b/drivers/ata/disk_drive.c
index 523edfd8c1..14b5e66141 100644
--- a/drivers/ata/disk_drive.c
+++ b/drivers/ata/disk_drive.c
@@ -190,11 +190,11 @@ static int disk_probe(struct device_d *dev)
 
 #ifdef CONFIG_ATA_BIOS
 	/* On x86, BIOS based disks are coming without a valid .size field */
-	if (dev->size == 0) {
+	if (dev->resource[0].size == 0) {
 		/* guess the size of this drive if not otherwise given */
-		dev->size = disk_guess_size(dev,
+		dev->resource[0].size = disk_guess_size(dev,
 			(struct partition_entry*)&sector[446]) * SECTOR_SIZE;
-		dev_info(dev, "Drive size guessed to %u kiB\n", dev->size / 1024);
+		dev_info(dev, "Drive size guessed to %u kiB\n", dev->resource[0].size / 1024);
 	}
 #endif
 	atablk->blk.num_blocks = dev->resource[0].size / SECTOR_SIZE;
diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index 84f9c81ecc..b8b2f39604 100644
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -124,6 +124,7 @@ int register_device(struct device_d *new_device)
 	INIT_LIST_HEAD(&new_device->children);
 	INIT_LIST_HEAD(&new_device->cdevs);
 	INIT_LIST_HEAD(&new_device->parameters);
+	INIT_LIST_HEAD(&new_device->active);
 
 	for_each_driver(drv) {
 		if (!match(drv, new_device))
diff --git a/drivers/mci/mxs.c b/drivers/mci/mxs.c
index a47762076c..70b8be9bf7 100644
--- a/drivers/mci/mxs.c
+++ b/drivers/mci/mxs.c
@@ -699,9 +699,9 @@ static int mxs_mci_probe(struct device_d *hw_dev)
 
 	hw_dev->priv = mxs_mci;
 	host->hw_dev = hw_dev;
-	host->send_cmd = mxs_mci_request,
-	host->set_ios = mxs_mci_set_ios,
-	host->init = mxs_mci_initialize,
+	host->send_cmd = mxs_mci_request;
+	host->set_ios = mxs_mci_set_ios;
+	host->init = mxs_mci_initialize;
 	mxs_mci->regs = dev_request_mem_region(dev, 0);
 
 	/* feed forward the platform specific values */
diff --git a/drivers/net/fec_mpc5200.c b/drivers/net/fec_mpc5200.c
index 4ebd9067c0..310d70d869 100644
--- a/drivers/net/fec_mpc5200.c
+++ b/drivers/net/fec_mpc5200.c
@@ -665,13 +665,13 @@ int mpc5xxx_fec_probe(struct device_d *dev)
         dev->type_data = edev;
 	fec = (mpc5xxx_fec_priv *)xmalloc(sizeof(*fec));
         edev->priv = fec;
-	edev->open = mpc5xxx_fec_open,
-	edev->init = mpc5xxx_fec_init,
-	edev->send = mpc5xxx_fec_send,
-	edev->recv = mpc5xxx_fec_recv,
-	edev->halt = mpc5xxx_fec_halt,
-	edev->get_ethaddr = mpc5xxx_fec_get_ethaddr,
-	edev->set_ethaddr = mpc5xxx_fec_set_ethaddr,
+	edev->open = mpc5xxx_fec_open;
+	edev->init = mpc5xxx_fec_init;
+	edev->send = mpc5xxx_fec_send;
+	edev->recv = mpc5xxx_fec_recv;
+	edev->halt = mpc5xxx_fec_halt;
+	edev->get_ethaddr = mpc5xxx_fec_get_ethaddr;
+	edev->set_ethaddr = mpc5xxx_fec_set_ethaddr;
 
 	fec->eth = dev_request_mem_region(dev, 0);
 	fec->tbdBase = (FEC_TBD *)FEC_BD_BASE;
diff --git a/drivers/serial/arm_dcc.c b/drivers/serial/arm_dcc.c
index 0199da30f9..e1066ab9d1 100644
--- a/drivers/serial/arm_dcc.c
+++ b/drivers/serial/arm_dcc.c
@@ -157,7 +157,6 @@ static struct driver_d arm_dcc_driver = {
 static struct device_d arm_dcc_device = {
 	.id	= -1,
 	.name	= "arm_dcc",
-	.size	= 4096,
 };
 
 static int arm_dcc_init(void)
diff --git a/drivers/serial/atmel.c b/drivers/serial/atmel.c
index ff0e75e2b3..2d4b842420 100644
--- a/drivers/serial/atmel.c
+++ b/drivers/serial/atmel.c
@@ -419,7 +419,7 @@ static int atmel_serial_probe(struct device_d *dev)
 }
 
 static struct driver_d atmel_serial_driver = {
-        .name  = "atmel_serial",
+        .name  = "atmel_usart",
         .probe = atmel_serial_probe,
 };