Merge branch 'develop'
This commit is contained in:
commit
d5ff9a1fb9
5
NEWS
5
NEWS
@ -1,3 +1,8 @@
|
|||||||
|
Version 0.4.1 - 16 January 2012
|
||||||
|
|
||||||
|
* Corrected a small error that yielded an confusing error message "The discrete
|
||||||
|
card could not be enabled by a _DSM call"
|
||||||
|
|
||||||
Version 0.4 - 15 January 2012
|
Version 0.4 - 15 January 2012
|
||||||
|
|
||||||
* Support for models that have a "3D controller" instead of "VGA compatible
|
* Support for models that have a "3D controller" instead of "VGA compatible
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
MODULE_LICENSE("GPL");
|
MODULE_LICENSE("GPL");
|
||||||
MODULE_DESCRIPTION("Toggle the discrete graphics card");
|
MODULE_DESCRIPTION("Toggle the discrete graphics card");
|
||||||
MODULE_AUTHOR("Peter Lekensteyn <lekensteyn@gmail.com>");
|
MODULE_AUTHOR("Peter Lekensteyn <lekensteyn@gmail.com>");
|
||||||
MODULE_VERSION("0.4");
|
MODULE_VERSION("0.4.1");
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
CARD_UNCHANGED = -1,
|
CARD_UNCHANGED = -1,
|
||||||
@ -190,7 +190,7 @@ static int bbswitch_acpi_on(void) {
|
|||||||
char args[] = {1, 0, 0, 0};
|
char args[] = {1, 0, 0, 0};
|
||||||
u32 result = 0;
|
u32 result = 0;
|
||||||
|
|
||||||
if (!acpi_call_dsm(dis_handle, acpi_nvidia_dsm_muid, 0x102, 0x3, args,
|
if (acpi_call_dsm(dis_handle, acpi_nvidia_dsm_muid, 0x102, 0x3, args,
|
||||||
&result)) {
|
&result)) {
|
||||||
// failure
|
// failure
|
||||||
return 1;
|
return 1;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user