diff options
| author | Len Brown <len.brown@intel.com> | 2009-04-05 01:50:46 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-04-05 01:50:46 -0400 |
| commit | 3b4dadf05d177289c279c50030c7c75e004952bb (patch) | |
| tree | 5ee1a21f5dd3d4682e7ed9f92ba97fa4a507f62f /drivers | |
| parent | 59b17bf6ea06abed519dfc788fff1b6b9499d23f (diff) | |
| parent | 7e90560c50f754d65884e251e94c1efa2a4b5784 (diff) | |
Merge branch 'acpi_enforce_resources' into release
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/acpi/osl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 1e35f342957c..f50ca1ea80c3 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c | |||
| @@ -1063,9 +1063,9 @@ __setup("acpi_wake_gpes_always_on", acpi_wake_gpes_always_on_setup); | |||
| 1063 | * in arbitrary AML code and can interfere with legacy drivers. | 1063 | * in arbitrary AML code and can interfere with legacy drivers. |
| 1064 | * acpi_enforce_resources= can be set to: | 1064 | * acpi_enforce_resources= can be set to: |
| 1065 | * | 1065 | * |
| 1066 | * - strict (2) | 1066 | * - strict (default) (2) |
| 1067 | * -> further driver trying to access the resources will not load | 1067 | * -> further driver trying to access the resources will not load |
| 1068 | * - lax (default) (1) | 1068 | * - lax (1) |
| 1069 | * -> further driver trying to access the resources will load, but you | 1069 | * -> further driver trying to access the resources will load, but you |
| 1070 | * get a system message that something might go wrong... | 1070 | * get a system message that something might go wrong... |
| 1071 | * | 1071 | * |
| @@ -1077,7 +1077,7 @@ __setup("acpi_wake_gpes_always_on", acpi_wake_gpes_always_on_setup); | |||
| 1077 | #define ENFORCE_RESOURCES_LAX 1 | 1077 | #define ENFORCE_RESOURCES_LAX 1 |
| 1078 | #define ENFORCE_RESOURCES_NO 0 | 1078 | #define ENFORCE_RESOURCES_NO 0 |
| 1079 | 1079 | ||
| 1080 | static unsigned int acpi_enforce_resources = ENFORCE_RESOURCES_LAX; | 1080 | static unsigned int acpi_enforce_resources = ENFORCE_RESOURCES_STRICT; |
| 1081 | 1081 | ||
| 1082 | static int __init acpi_enforce_resources_setup(char *str) | 1082 | static int __init acpi_enforce_resources_setup(char *str) |
| 1083 | { | 1083 | { |