diff options
| author |   Paul Mackerras <paulus@samba.org> | 2007-11-02 14:03:14 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-11-02 14:03:14 +1100 |
| commit | 97a4649d6ffce4a5d7f5ce018d87a6cefcb4ad03 (patch) | |
| tree | 8f7f591754baa934a842357e75e773a525bfb147 /drivers/video/aty/radeon_pm.c | |
| parent | [POWERPC] powerpc: Fix demotion of segments to 4K pages (diff) | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| download | linux-dev-97a4649d6ffce4a5d7f5ce018d87a6cefcb4ad03.tar.xz linux-dev-97a4649d6ffce4a5d7f5ce018d87a6cefcb4ad03.zip | |
Merge branch 'linux-2.6' into merge
Diffstat (limited to '')
| -rw-r--r-- | drivers/video/aty/radeon_pm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/aty/radeon_pm.c b/drivers/video/aty/radeon_pm.c index be1d57bf9dc8..83ee3e75386c 100644 --- a/drivers/video/aty/radeon_pm.c +++ b/drivers/video/aty/radeon_pm.c @@ -27,8 +27,6 @@ #include "ati_ids.h" -static void radeon_reinitialize_M10(struct radeonfb_info *rinfo); - /* * Workarounds for bugs in PC laptops: * - enable D2 sleep in some IBM Thinkpads @@ -39,6 +37,8 @@ static void radeon_reinitialize_M10(struct radeonfb_info *rinfo); */ #if defined(CONFIG_PM) && defined(CONFIG_X86) +static void radeon_reinitialize_M10(struct radeonfb_info *rinfo); + struct radeon_device_id { const char *ident; /* (arbitrary) Name */ const unsigned short subsystem_vendor; /* Subsystem Vendor ID */ |