Merge git://git.marvell.com/orion into devel

This commit is contained in:
Russell King 2008-12-13 09:12:51 +00:00 • committed by Russell King
commit 72aaf09fda
294 changed files with 5979 additions and 2409 deletions

View file

@ -419,7 +419,7 @@ static void icside_setup_ports(hw_regs_t *hw, void __iomem *base,
hw->chipset = ide_acorn;
}
static int __init
static int __devinit
icside_register_v5(struct icside_state *state, struct expansion_card *ec)
{
void __iomem *base;
@ -473,7 +473,7 @@ static const struct ide_port_info icside_v6_port_info __initdata = {
.swdma_mask = ATA_SWDMA2,
};
static int __init
static int __devinit
icside_register_v6(struct icside_state *state, struct expansion_card *ec)
{
void __iomem *ioc_base, *easi_base;