diff options
author | Dave Airlie <airlied@redhat.com> | 2010-03-01 05:50:01 -0500 |
---|---|---|
committer | Dave Airlie <airlied@ppcg5.localdomain> | 2010-03-01 06:21:58 -0500 |
commit | 8edb381d6705811b278527907a5ae2a9c4db8074 (patch) | |
tree | 3e9c0c6474eba65cfafc2652c49be002ae76a493 /drivers/gpu/drm/radeon/radeon.h | |
parent | 55a5cb5d594c18b3147a2288b00ea359c1a38cf8 (diff) |
vga_switcheroo: fix build on platforms with no ACPI
radeon was always including the atpx code unnecessarily, also core
switcheroo was including acpi headers.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon.h')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index ad9d55f9439..829e26e8a4b 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h | |||
@@ -121,8 +121,19 @@ struct radeon_device; | |||
121 | */ | 121 | */ |
122 | #define ATRM_BIOS_PAGE 4096 | 122 | #define ATRM_BIOS_PAGE 4096 |
123 | 123 | ||
124 | #if defined(CONFIG_VGA_SWITCHEROO) | ||
124 | bool radeon_atrm_supported(struct pci_dev *pdev); | 125 | bool radeon_atrm_supported(struct pci_dev *pdev); |
125 | int radeon_atrm_get_bios_chunk(uint8_t *bios, int offset, int len); | 126 | int radeon_atrm_get_bios_chunk(uint8_t *bios, int offset, int len); |
127 | #else | ||
128 | static inline bool radeon_atrm_supported(struct pci_dev *pdev) | ||
129 | { | ||
130 | return false; | ||
131 | } | ||
132 | |||
133 | static inline int radeon_atrm_get_bios_chunk(uint8_t *bios, int offset, int len){ | ||
134 | return -EINVAL; | ||
135 | } | ||
136 | #endif | ||
126 | bool radeon_get_bios(struct radeon_device *rdev); | 137 | bool radeon_get_bios(struct radeon_device *rdev); |
127 | 138 | ||
128 | 139 | ||