diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-08-05 17:41:38 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-08-05 17:41:38 +0200 |
commit | 582120ee21220de933b750c503e429c01366f1f7 (patch) | |
tree | 406966d4576f916961244d81a5b5c6f70ae71836 | |
parent | ea8ff20cdcb1820a3b8737fbba876cf95aa73a34 (diff) | |
parent | f5cd2a3fb78fc11a7f3788233627f81b6c878893 (diff) | |
download | alsa-driver-build-unstable-582120ee21220de933b750c503e429c01366f1f7.tar.gz |
Merge remote-tracking branch 'stable/build' into build
-rw-r--r-- | alsa/configure.ac | 2 | ||||
-rw-r--r-- | alsa/include/dell_led_compat.h | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/alsa/configure.ac b/alsa/configure.ac index 7360c68af..671b59372 100644 --- a/alsa/configure.ac +++ b/alsa/configure.ac @@ -1636,6 +1636,8 @@ CHECK_KERNEL_HEADER(linux/atomic.h, [#include <asm/atomic.h> ]) CHECK_KERNEL_HEADER(linux/thinkpad_acpi.h, [#include \"thinkpad_acpi_compat.h\" ]) +CHECK_KERNEL_HEADER(linux/dell-led.h, [#include \"dell_led_compat.h\" +]) dnl link to the latest trace/events/*.h echo "Copying trace/events headers" diff --git a/alsa/include/dell_led_compat.h b/alsa/include/dell_led_compat.h new file mode 100644 index 000000000..7009b8bec --- /dev/null +++ b/alsa/include/dell_led_compat.h @@ -0,0 +1,10 @@ +#ifndef __DELL_LED_H__ +#define __DELL_LED_H__ + +enum { + DELL_LED_MICMUTE, +}; + +int dell_app_wmi_led_set(int whichled, int on); + +#endif |