diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2012-04-07 12:28:00 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-04-07 12:28:00 +0200 |
| commit | c38f62b08d800104fa9b0e9d6e9141459986c06d (patch) | |
| tree | 1d04d768c8aa0c1a544d1f068317c7beb0101be2 /arch/x86/um/user-offsets.c | |
| parent | ALSA: hda - clean up CX20549 test mixer setup (diff) | |
| parent | ASoC: tegra: fix i2s compilation when !CONFIG_DEBUG_FS (diff) | |
| download | linux-dev-c38f62b08d800104fa9b0e9d6e9141459986c06d.tar.xz linux-dev-c38f62b08d800104fa9b0e9d6e9141459986c06d.zip | |
Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: fixes for 3.4
A bunch of driver-specific fixes and one generic fix for the new support
for platform DAPM contexts - we were picking the wrong default for the
idle_bias_off setting which was meaning we weren't actually achieving
any useful runtime PM on platform devices.
Diffstat (limited to 'arch/x86/um/user-offsets.c')
| -rw-r--r-- | arch/x86/um/user-offsets.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/um/user-offsets.c b/arch/x86/um/user-offsets.c index 5edf4f4bbf53..ce7e3607a870 100644 --- a/arch/x86/um/user-offsets.c +++ b/arch/x86/um/user-offsets.c @@ -15,6 +15,8 @@ static char syscalls[] = { }; #else #define __SYSCALL_64(nr, sym, compat) [nr] = 1, +#define __SYSCALL_COMMON(nr, sym, compat) [nr] = 1, +#define __SYSCALL_X32(nr, sym, compat) /* Not supported */ static char syscalls[] = { #include <asm/syscalls_64.h> }; |