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/piix.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/piix.c')
| -rw-r--r-- | drivers/ide/piix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/piix.c b/drivers/ide/piix.c index 1892e81fb00..fe0fd60cfc0 100644 --- a/drivers/ide/piix.c +++ b/drivers/ide/piix.c @@ -344,7 +344,7 @@ static const struct ide_port_ops ich_port_ops = { .udma_mask = udma, \ } -static const struct ide_port_info piix_pci_info[] __devinitdata = { +static const struct ide_port_info piix_pci_info[] __devinitconst = { /* 0: MPIIX */ { /* * MPIIX actually has only a single IDE channel mapped to |