diff options
| author | Len Brown <len.brown@intel.com> | 2009-01-09 03:37:20 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-01-09 03:37:20 -0500 |
| commit | 33a8c927e423a205bcbbecdc43b451bad781a08e (patch) | |
| tree | 4ed692143eec382ba87872cc48e7162e06bd7465 /drivers/acpi/video_detect.c | |
| parent | b8ef914e58e90c3b4dba5f5bdd8ab04c45d3e008 (diff) | |
| parent | 8a383ef0be01e0e6e84c85f8bf35e4e6fcfb8981 (diff) | |
Merge branch 'fluff' into release
Diffstat (limited to 'drivers/acpi/video_detect.c')
| -rw-r--r-- | drivers/acpi/video_detect.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c index f022eb6f563..50e3d2dbf3a 100644 --- a/drivers/acpi/video_detect.c +++ b/drivers/acpi/video_detect.c @@ -234,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; @@ -250,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; |