diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-01-23 23:29:14 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-01-23 23:29:14 -0500 |
| commit | dcb571be2019ae677bc5ed64437dbc87ae1eb67f (patch) | |
| tree | 1b93f9ea3568be4dcc49ffb2adc0d3ab0a02b47f /arch/powerpc/sysdev/mpic.c | |
| parent | 9156ad48338e0306e508ead5c0d9986050744475 (diff) | |
| parent | 96f39c1718091d63dc1c5012d566737ea0d2a20c (diff) | |
Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into for-2.6.25
Diffstat (limited to 'arch/powerpc/sysdev/mpic.c')
| -rw-r--r-- | arch/powerpc/sysdev/mpic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c index f88ff09c4711..0da7069c7c62 100644 --- a/arch/powerpc/sysdev/mpic.c +++ b/arch/powerpc/sysdev/mpic.c | |||
| @@ -267,7 +267,7 @@ static inline void _mpic_irq_write(struct mpic *mpic, unsigned int src_no, | |||
| 267 | */ | 267 | */ |
| 268 | 268 | ||
| 269 | 269 | ||
| 270 | static void _mpic_map_mmio(struct mpic *mpic, unsigned long phys_addr, | 270 | static void _mpic_map_mmio(struct mpic *mpic, phys_addr_t phys_addr, |
| 271 | struct mpic_reg_bank *rb, unsigned int offset, | 271 | struct mpic_reg_bank *rb, unsigned int offset, |
| 272 | unsigned int size) | 272 | unsigned int size) |
| 273 | { | 273 | { |
| @@ -287,7 +287,7 @@ static void _mpic_map_dcr(struct mpic *mpic, struct mpic_reg_bank *rb, | |||
| 287 | BUG_ON(!DCR_MAP_OK(rb->dhost)); | 287 | BUG_ON(!DCR_MAP_OK(rb->dhost)); |
| 288 | } | 288 | } |
| 289 | 289 | ||
| 290 | static inline void mpic_map(struct mpic *mpic, unsigned long phys_addr, | 290 | static inline void mpic_map(struct mpic *mpic, phys_addr_t phys_addr, |
| 291 | struct mpic_reg_bank *rb, unsigned int offset, | 291 | struct mpic_reg_bank *rb, unsigned int offset, |
| 292 | unsigned int size) | 292 | unsigned int size) |
| 293 | { | 293 | { |