diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 17:55:32 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 17:55:32 +0000 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /drivers/acpi/resources/rsmisc.c | |
| parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
| download | kernel-crypto-a815752ac0ffdb910e92958d41d28f4fb28e5296.tar.gz kernel-crypto-a815752ac0ffdb910e92958d41d28f4fb28e5296.tar.xz kernel-crypto-a815752ac0ffdb910e92958d41d28f4fb28e5296.zip | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/acpi/resources/rsmisc.c')
| -rw-r--r-- | drivers/acpi/resources/rsmisc.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/acpi/resources/rsmisc.c b/drivers/acpi/resources/rsmisc.c index c7081afa893..de1ac3881b2 100644 --- a/drivers/acpi/resources/rsmisc.c +++ b/drivers/acpi/resources/rsmisc.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2007, R. Byron Moore + * Copyright (C) 2000 - 2008, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -497,6 +497,17 @@ acpi_rs_convert_resource_to_aml(struct acpi_resource *resource, } break; + case ACPI_RSC_EXIT_EQ: + /* + * Control - Exit conversion if equal + */ + if (*ACPI_ADD_PTR(u8, resource, + COMPARE_TARGET(info)) == + COMPARE_VALUE(info)) { + goto exit; + } + break; + default: ACPI_ERROR((AE_INFO, "Invalid conversion opcode")); |