diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-10-28 10:55:30 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-10-28 10:55:30 +0100 |
| commit | 5cdeee33b657f6f13cdf90d2743a3c69eb3174dd (patch) | |
| tree | ff6aae5ea1eaa982c0cd09fd03161c58073fa8f1 | |
| parent | 24d20ba69ac63ec313df6ecf9dde59567fa6c820 (diff) | |
| parent | 7df754e2b50e92567a760c947caeb3748a1c6bc0 (diff) | |
| download | alsa-driver-build-unstable-5cdeee33b657f6f13cdf90d2743a3c69eb3174dd.tar.gz | |
Merge remote-tracking branch 'stable/build' into build
| -rw-r--r-- | alsa/configure.in | 3 | ||||
| -rw-r--r-- | alsa/include/thinkpad_acpi_compat.h | 15 |
2 files changed, 17 insertions, 1 deletions
diff --git a/alsa/configure.in b/alsa/configure.in index f28a080f8..7360c68af 100644 --- a/alsa/configure.in +++ b/alsa/configure.in @@ -1634,7 +1634,8 @@ CHECK_KERNEL_HEADER(linux/i8253.h, [#include <asm/i8253.h> ]) CHECK_KERNEL_HEADER(linux/atomic.h, [#include <asm/atomic.h> ]) -CHECK_KERNEL_HEADER(linux/thinkpad_acpi.h) +CHECK_KERNEL_HEADER(linux/thinkpad_acpi.h, [#include \"thinkpad_acpi_compat.h\" +]) dnl link to the latest trace/events/*.h echo "Copying trace/events headers" diff --git a/alsa/include/thinkpad_acpi_compat.h b/alsa/include/thinkpad_acpi_compat.h new file mode 100644 index 000000000..361de59a2 --- /dev/null +++ b/alsa/include/thinkpad_acpi_compat.h @@ -0,0 +1,15 @@ +#ifndef __THINKPAD_ACPI_H__ +#define __THINKPAD_ACPI_H__ + +/* These two functions return 0 if success, or negative error code + (e g -ENODEV if no led present) */ + +enum { + TPACPI_LED_MUTE, + TPACPI_LED_MICMUTE, + TPACPI_LED_MAX, +}; + +int tpacpi_led_set(int whichled, bool on); + +#endif |