diff options
author | Dave Airlie <airlied@redhat.com> | 2010-03-01 21:50:01 +1100 |
---|---|---|
committer | Dave Airlie <airlied@ppcg5.localdomain> | 2010-03-01 22:21:58 +1100 |
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; */ #define ATRM_BIOS_PAGE 4096 +#if defined(CONFIG_VGA_SWITCHEROO) bool radeon_atrm_supported(struct pci_dev *pdev); int radeon_atrm_get_bios_chunk(uint8_t *bios, int offset, int len); +#else +static inline bool radeon_atrm_supported(struct pci_dev *pdev) +{ + return false; +} + +static inline int radeon_atrm_get_bios_chunk(uint8_t *bios, int offset, int len){ + return -EINVAL; +} +#endif bool radeon_get_bios(struct radeon_device *rdev); |