diff options
author | Takashi Iwai <tiwai@suse.de> | 2017-11-13 15:43:04 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2017-11-13 15:43:13 +0100 |
commit | c429bda21ffafb28f02fb2eb4055b4ab6879ed58 (patch) | |
tree | 80715bf534bfa3bcb69ef77cf1dc5f9d98919b44 /sound/oss/soundvers.h | |
parent | ALSA: hda - fix headset mic problem for Dell machines with alc274 (diff) | |
parent | ALSA: ice1712: define i2c eeprom addr to header file (diff) | |
download | linux-c429bda21ffafb28f02fb2eb4055b4ab6879ed58.tar.gz linux-c429bda21ffafb28f02fb2eb4055b4ab6879ed58.tar.bz2 linux-c429bda21ffafb28f02fb2eb4055b4ab6879ed58.zip |
Merge branch 'for-next' into for-linus
Pull 4.15 updates to take over the previous urgent fixes.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/oss/soundvers.h')
-rw-r--r-- | sound/oss/soundvers.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/oss/soundvers.h b/sound/oss/soundvers.h deleted file mode 100644 index e9084d2f46a9..000000000000 --- a/sound/oss/soundvers.h +++ /dev/null @@ -1,2 +0,0 @@ -#define SOUND_VERSION_STRING "3.8s2++-971130" -#define SOUND_INTERNAL_VERSION 0x030804 |