Merge branch 'suspend' into release

[mv-sheeva.git] / drivers / acpi / video_detect.c

diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c
index 70b1e91ae2ab63ee6b94ec46aace3c67ae1846b2..50e3d2dbf3af8dcb4dca0e280f0a7efa891d0738 100644 (file)
--- a/drivers/acpi/video_detect.c
+++ b/drivers/acpi/video_detect.c
@@ -38,7 +38,6 @@
 #include <linux/dmi.h>
 
 ACPI_MODULE_NAME("video");
-#define ACPI_VIDEO_COMPONENT           0x08000000
 #define _COMPONENT             ACPI_VIDEO_COMPONENT
 
 static long acpi_video_support;
@@ -235,7 +234,7 @@ EXPORT_SYMBOL(acpi_video_display_switch_support);
  * To force that backlight or display output switching is processed by vendor
  * specific acpi drivers or video.ko driver.
  */
-int __init acpi_backlight(char *str)
+static int __init acpi_backlight(char *str)
 {
        if (str == NULL || *str == '\0')
                return 1;
@@ -251,7 +250,7 @@ int __init acpi_backlight(char *str)
 }
 __setup("acpi_backlight=", acpi_backlight);
 
-int __init acpi_display_output(char *str)
+static int __init acpi_display_output(char *str)
 {
        if (str == NULL || *str == '\0')
                return 1;