diff options
| author | Alexander Graf <agraf@suse.de> | 2012-10-31 13:36:18 +0100 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2012-10-31 13:36:18 +0100 |
| commit | 0588000eac9ba4178cebade437da3b28e8fad48f (patch) | |
| tree | 697e514a0a0193f17a54f372dd18c5cd3927e154 /drivers/ide/icside.c | |
| parent | 8b5869ad85f703ffeb25e656eab826f6b85b984c (diff) | |
| parent | 81c52c56e2b43589091ee29038bcf793d3f184ab (diff) | |
Merge commit 'origin/queue' into for-queue
Conflicts:
arch/powerpc/include/asm/Kbuild
arch/powerpc/include/uapi/asm/Kbuild
Diffstat (limited to 'drivers/ide/icside.c')
| -rw-r--r-- | drivers/ide/icside.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/icside.c b/drivers/ide/icside.c index bcb507b0cfd..e640d0ac3af 100644 --- a/drivers/ide/icside.c +++ b/drivers/ide/icside.c @@ -451,7 +451,7 @@ err_free: return ret; } -static const struct ide_port_info icside_v6_port_info __initdata = { +static const struct ide_port_info icside_v6_port_info __initconst = { .init_dma = icside_dma_off_init, .port_ops = &icside_v6_no_dma_port_ops, .host_flags = IDE_HFLAG_SERIALIZE | IDE_HFLAG_MMIO, |