diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-27 14:29:03 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-27 14:29:03 -0800 |
| commit | 7749c902592f610dc448830210174ab922f54be9 (patch) | |
| tree | aad9430a5d5ff71b68b4f798859a5ac98143d005 /drivers/ide/legacy/ali14xx.c | |
| parent | 2ea0718884c520f85c869c3bfef57477316ea91f (diff) | |
| parent | 6413f08666830afec21e41e50c28a2c5105ede69 (diff) | |
| download | linux-7749c902592f610dc448830210174ab922f54be9.tar.gz linux-7749c902592f610dc448830210174ab922f54be9.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
ide-scsi: use print_hex_dump from <linux/kernel.h>
ide: More TSST drives with broken cable detection
ali14xx: constify __initdata
ide: remove bogus ide_fix_driveid() comment
trm290: remove bogus init_hwif_trm290() comment
piix: add HP compaq laptop to short cable list
alim15x3: add Mitac 8317 and derivatives to ali_cable_override()
ide: add TORiSAN model: CD-ROM CDR_U200 fw: 1.09 to DMA blacklist
amd74xx: arm hack
drivers/ide: Add missing "space"
ide-cris: don't override ide_register_hw() result
ide: move CONFIG_IDE_ETRAX to drivers/ide/Kconfig
ide: add CONFIG_IDE_H8300 config option
ide/Kconfig: fix mpc8xx host driver dependencies
macide/q40ide: add missing __init tag to {macide,q40ide}_init()
aec62xx: Fix kernel oops in driver's probe function
ide: skip ide_wait_not_busy() on noprobe-disks
siimage: remove resetproc() method
ide: don't set PIO mode on pre-EIDE drives
sis5513.c: Add Packard Bell EasyNote K5305 to laptops
Diffstat (limited to 'drivers/ide/legacy/ali14xx.c')
| -rw-r--r-- | drivers/ide/legacy/ali14xx.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/ide/legacy/ali14xx.c b/drivers/ide/legacy/ali14xx.c index 10311ecc674a..38c3a6d63f30 100644 --- a/drivers/ide/legacy/ali14xx.c +++ b/drivers/ide/legacy/ali14xx.c @@ -53,12 +53,13 @@ /* port addresses for auto-detection */ #define ALI_NUM_PORTS 4 -static int ports[ALI_NUM_PORTS] __initdata = {0x074, 0x0f4, 0x034, 0x0e4}; +static const int ports[ALI_NUM_PORTS] __initdata = + { 0x074, 0x0f4, 0x034, 0x0e4 }; /* register initialization data */ typedef struct { u8 reg, data; } RegInitializer; -static RegInitializer initData[] __initdata = { +static const RegInitializer initData[] __initdata = { {0x01, 0x0f}, {0x02, 0x00}, {0x03, 0x00}, {0x04, 0x00}, {0x05, 0x00}, {0x06, 0x00}, {0x07, 0x2b}, {0x0a, 0x0f}, {0x25, 0x00}, {0x26, 0x00}, {0x27, 0x00}, {0x28, 0x00}, @@ -177,7 +178,7 @@ static int __init findPort (void) * Initialize controller registers with default values. */ static int __init initRegisters (void) { - RegInitializer *p; + const RegInitializer *p; u8 t; unsigned long flags; |