Merge branch 'merge' into next

2008-12-16 14:38:58 +11:00
parent 91cac62326 23e0e8afaf
commit 1e1c568d6c
197 changed files with 3854 additions and 2530 deletions
@@ -413,6 +413,9 @@ static int axon_msi_probe(struct of_device *device,
 			MSIC_CTRL_IRQ_ENABLE | MSIC_CTRL_ENABLE |
 			MSIC_CTRL_FIFO_SIZE);

+	msic->read_offset = dcr_read(msic->dcr_host, MSIC_WRITE_OFFSET_REG)
+				& MSIC_FIFO_SIZE_MASK;
+
 	device->dev.platform_data = msic;

 	ppc_md.setup_msi_irqs = axon_msi_setup_msi_irqs;