diff options
| author | Olof Johansson <olof@lixom.net> | 2013-08-29 17:44:42 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-08-29 17:44:42 (GMT) |
| commit | 293d0e3bf0818f3f7307a56d3ac31f41b5078aa1 (patch) | |
| tree | aab2e5026c66d52581c39b5c21aca6e3fd8d0357 /drivers/acpi/internal.h | |
| parent | a9b1ae088dcb68c1c026dfaf88e2f223eef31678 (diff) | |
| parent | 3a76b35186cb967a69c4a3935caf2fdf428e933b (diff) | |
| download | linux-fsl-qoriq-293d0e3bf0818f3f7307a56d3ac31f41b5078aa1.tar.xz | |
Merge branch 'armsoc/for-3.12/soc' of git://github.com/broadcom/bcm11351 into next/boards
From Christian Daudt, SoC changes for Broadcom.
* 'armsoc/for-3.12/soc' of git://github.com/broadcom/bcm11351: (673 commits)
ARM: bcm: Make secure API call optional
ARM: DT: binding fixup to align with vendor-prefixes.txt (drivers)
ARM: mmc: fix NONREMOVABLE test in sdhci-bcm-kona
ARM: bcm: Rename board_bcm
mmc: sdhci-bcm-kona: make linker-section warning go away
ARM: configs: disable DEBUG_LL in bcm_defconfig
ARM: bcm281xx: Board specific reboot code
ARM bcm281xx: Turn on socket & network support.
ARM: bcm281xx: Turn on L2 cache.
+ Linux 3.11-rc4
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/acpi/internal.h')
| -rw-r--r-- | drivers/acpi/internal.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h index 227aca7..5da44e8 100644 --- a/drivers/acpi/internal.h +++ b/drivers/acpi/internal.h @@ -169,10 +169,8 @@ int acpi_create_platform_device(struct acpi_device *adev, -------------------------------------------------------------------------- */ #if defined(CONFIG_ACPI_VIDEO) || defined(CONFIG_ACPI_VIDEO_MODULE) bool acpi_video_backlight_quirks(void); -bool acpi_video_verify_backlight_support(void); #else static inline bool acpi_video_backlight_quirks(void) { return false; } -static inline bool acpi_video_verify_backlight_support(void) { return false; } #endif #endif /* _ACPI_INTERNAL_H_ */ |