diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-13 20:28:05 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-13 20:28:05 -0400 |
| commit | db9ca5803566078aafe63cf364ef98b5097e4194 (patch) | |
| tree | ce330cdf21728f00801004e3900c79e4195cd516 /include | |
| parent | bf717b11aec20965d48dea36dea3eea18a75d18c (diff) | |
| parent | eb35cf60e462491249166182e3e755d3d5d91a28 (diff) | |
| download | linux-db9ca5803566078aafe63cf364ef98b5097e4194.tar.gz linux-db9ca5803566078aafe63cf364ef98b5097e4194.tar.bz2 linux-db9ca5803566078aafe63cf364ef98b5097e4194.zip | |
Merge branch 'master' into upstream
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/arch-pxa/ohci.h | 2 | ||||
| -rw-r--r-- | include/linux/pci-acpi.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-arm/arch-pxa/ohci.h b/include/asm-arm/arch-pxa/ohci.h index 7da89569061e..e848a47128cd 100644 --- a/include/asm-arm/arch-pxa/ohci.h +++ b/include/asm-arm/arch-pxa/ohci.h @@ -11,6 +11,8 @@ struct pxaohci_platform_data { #define PMM_NPS_MODE 1 #define PMM_GLOBAL_MODE 2 #define PMM_PERPORT_MODE 3 + + int power_budget; }; extern void pxa_set_ohci_info(struct pxaohci_platform_data *info); diff --git a/include/linux/pci-acpi.h b/include/linux/pci-acpi.h index 4877e35ae202..936ef82ed76a 100644 --- a/include/linux/pci-acpi.h +++ b/include/linux/pci-acpi.h @@ -50,7 +50,7 @@ extern acpi_status pci_osc_control_set(acpi_handle handle, u32 flags); extern acpi_status pci_osc_support_set(u32 flags); #else -#if !defined(acpi_status) +#if !defined(AE_ERROR) typedef u32 acpi_status; #define AE_ERROR (acpi_status) (0x0001) #endif |