diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-04-10 14:05:20 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-04-10 14:05:20 +0200 |
| commit | 5b4bdac94243b931a2c454dc7d925d23816a2426 (patch) | |
| tree | 88c9ee36dcd4c7453917e84d0ba2fb99055571bd /include/linux/acpi.h | |
| parent | 1ca8094403ae5553c6a0f404842be3075b302c70 (diff) | |
| parent | db4f3dab629109882170a7b1b8fb655a34c52846 (diff) | |
| download | op-kernel-dev-5b4bdac94243b931a2c454dc7d925d23816a2426.zip op-kernel-dev-5b4bdac94243b931a2c454dc7d925d23816a2426.tar.gz | |
Merge tag 'omap-pm-v3.10/cleanup/cpuidle-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into pm-cpuidle
OMAP CPUidle cleanups for v3.10 from Kevin Hilman
Diffstat (limited to 'include/linux/acpi.h')
| -rw-r--r-- | include/linux/acpi.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index bcbdd74..edaf311 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -204,7 +204,7 @@ extern bool wmi_has_guid(const char *guid); #if defined(CONFIG_ACPI_VIDEO) || defined(CONFIG_ACPI_VIDEO_MODULE) extern long acpi_video_get_capabilities(acpi_handle graphics_dev_handle); -extern long acpi_is_video_device(struct acpi_device *device); +extern long acpi_is_video_device(acpi_handle handle); extern void acpi_video_dmi_promote_vendor(void); extern void acpi_video_dmi_demote_vendor(void); extern int acpi_video_backlight_support(void); @@ -217,7 +217,7 @@ static inline long acpi_video_get_capabilities(acpi_handle graphics_dev_handle) return 0; } -static inline long acpi_is_video_device(struct acpi_device *device) +static inline long acpi_is_video_device(acpi_handle handle) { return 0; } |
