diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-04-29 22:38:01 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-04-29 22:38:01 -0400 |
| commit | 49e1900d4cc2e7bcecb681fe60f0990bec2dcce8 (patch) | |
| tree | 253801ebf57e0a23856a2c7be129c2c178f62fdf /drivers/video/aty/radeonfb.h | |
| parent | 34f6d749c0a328817d5e36274e53121c1db734dc (diff) | |
| parent | b9099ff63c75216d6ca10bce5a1abcd9293c27e6 (diff) | |
Merge branch 'linux-2.6' into for-2.6.22
Diffstat (limited to 'drivers/video/aty/radeonfb.h')
| -rw-r--r-- | drivers/video/aty/radeonfb.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/aty/radeonfb.h b/drivers/video/aty/radeonfb.h index d5ff224a6258..319000360285 100644 --- a/drivers/video/aty/radeonfb.h +++ b/drivers/video/aty/radeonfb.h | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | 16 | ||
| 17 | #include <asm/io.h> | 17 | #include <asm/io.h> |
| 18 | 18 | ||
| 19 | #ifdef CONFIG_PPC_OF | 19 | #if defined(CONFIG_PPC_OF) || defined(CONFIG_SPARC) |
| 20 | #include <asm/prom.h> | 20 | #include <asm/prom.h> |
| 21 | #endif | 21 | #endif |
| 22 | 22 | ||
| @@ -292,7 +292,7 @@ struct radeonfb_info { | |||
| 292 | unsigned long fb_local_base; | 292 | unsigned long fb_local_base; |
| 293 | 293 | ||
| 294 | struct pci_dev *pdev; | 294 | struct pci_dev *pdev; |
| 295 | #ifdef CONFIG_PPC_OF | 295 | #if defined(CONFIG_PPC_OF) || defined(CONFIG_SPARC) |
| 296 | struct device_node *of_node; | 296 | struct device_node *of_node; |
| 297 | #endif | 297 | #endif |
| 298 | 298 | ||