diff options
| author | Dave Kleikamp <shaggy@kleikamp.(none)> | 2005-05-04 17:43:30 -0400 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@kleikamp.(none)> | 2005-05-04 17:43:30 -0400 |
| commit | ddf3e298b33f3e15a2e6272e0146dfa940c89a74 (patch) | |
| tree | cd474d1eca4f337958e97a09dcb0974b1f8aba82 /drivers/pci/pci-acpi.c | |
| parent | 7a694ca74958b97ae2d437c8a730bddd9e9792c3 (diff) | |
| parent | 1d42a0ecf478962e8aede355a0be41365c117ff0 (diff) | |
Merge with /home/shaggy/git/linus-clean/
Diffstat (limited to 'drivers/pci/pci-acpi.c')
| -rw-r--r-- | drivers/pci/pci-acpi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c index 968eb32f292d..bc01d34e2634 100644 --- a/drivers/pci/pci-acpi.c +++ b/drivers/pci/pci-acpi.c | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | 19 | ||
| 20 | static u32 ctrlset_buf[3] = {0, 0, 0}; | 20 | static u32 ctrlset_buf[3] = {0, 0, 0}; |
| 21 | static u32 global_ctrlsets = 0; | 21 | static u32 global_ctrlsets = 0; |
| 22 | u8 OSC_UUID[16] = {0x5B, 0x4D, 0xDB, 0x33, 0xF7, 0x1F, 0x1C, 0x40, 0x96, 0x57, 0x74, 0x41, 0xC0, 0x3D, 0xD7, 0x66}; | 22 | static u8 OSC_UUID[16] = {0x5B, 0x4D, 0xDB, 0x33, 0xF7, 0x1F, 0x1C, 0x40, 0x96, 0x57, 0x74, 0x41, 0xC0, 0x3D, 0xD7, 0x66}; |
| 23 | 23 | ||
| 24 | static acpi_status | 24 | static acpi_status |
| 25 | acpi_query_osc ( | 25 | acpi_query_osc ( |