diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-01-22 02:55:25 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-01-22 02:55:25 -0500 |
| commit | 7755726fe90a8b253659756e6de68c1a55aa427f (patch) | |
| tree | a3523fa77e07854db3b8089e3066a55ea997060c /arch/mips/sgi-ip22/ip22-eisa.c | |
| parent | 3bf127637e22ddf95e67e10a23c339cee3d52429 (diff) | |
| parent | 92dcffb916d309aa01778bf8963a6932e4014d07 (diff) | |
Merge commit 'v2.6.33-rc5' into next
Diffstat (limited to 'arch/mips/sgi-ip22/ip22-eisa.c')
| -rw-r--r-- | arch/mips/sgi-ip22/ip22-eisa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/sgi-ip22/ip22-eisa.c b/arch/mips/sgi-ip22/ip22-eisa.c index 1617241d2737..da44ccb20829 100644 --- a/arch/mips/sgi-ip22/ip22-eisa.c +++ b/arch/mips/sgi-ip22/ip22-eisa.c | |||
| @@ -50,9 +50,9 @@ | |||
| 50 | 50 | ||
| 51 | static char __init *decode_eisa_sig(unsigned long addr) | 51 | static char __init *decode_eisa_sig(unsigned long addr) |
| 52 | { | 52 | { |
| 53 | static char sig_str[EISA_SIG_LEN]; | 53 | static char sig_str[EISA_SIG_LEN] __initdata; |
| 54 | u8 sig[4]; | 54 | u8 sig[4]; |
| 55 | u16 rev; | 55 | u16 rev; |
| 56 | int i; | 56 | int i; |
| 57 | 57 | ||
| 58 | for (i = 0; i < 4; i++) { | 58 | for (i = 0; i < 4; i++) { |