diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2005-10-20 04:21:33 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-10-20 04:21:33 -0400 |
| commit | 312f5726055534be1dc9dd369be13aabd2943fcb (patch) | |
| tree | 29394a3f83b4952a73b36a4aa962dfeda839e9db /include/asm-sparc64/openprom.h | |
| parent | 3d5efad953c6d5ba11d5bcb584ef8e906f953a73 (diff) | |
| parent | 93918e9afc76717176e9e114e79cdbb602a45ae8 (diff) | |
merge Linus head tree into my drm tree and fix up conflicts
Diffstat (limited to 'include/asm-sparc64/openprom.h')
| -rw-r--r-- | include/asm-sparc64/openprom.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-sparc64/openprom.h b/include/asm-sparc64/openprom.h index 0a336901d585..b4959d2b0d99 100644 --- a/include/asm-sparc64/openprom.h +++ b/include/asm-sparc64/openprom.h | |||
| @@ -186,8 +186,8 @@ struct linux_prom_registers { | |||
| 186 | }; | 186 | }; |
| 187 | 187 | ||
| 188 | struct linux_prom64_registers { | 188 | struct linux_prom64_registers { |
| 189 | long phys_addr; | 189 | unsigned long phys_addr; |
| 190 | long reg_size; | 190 | unsigned long reg_size; |
| 191 | }; | 191 | }; |
| 192 | 192 | ||
| 193 | struct linux_prom_irqs { | 193 | struct linux_prom_irqs { |