diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-08-01 11:12:10 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-08-01 11:12:10 +0200 |
commit | 209fb1b7e298c5f5a93a9450bc9e9e7923f745d9 (patch) | |
tree | 27cbfa78e5eeaceb2aae1c165f7f0e24f6fee286 /arch/alpha/include/asm/param.h | |
parent | a8d30608eaed6cc759b8e2e8a8bbbb42591f797f (diff) | |
parent | 3fef7f795fff7ccc58d55a28315ca73305515884 (diff) | |
download | linux-209fb1b7e298c5f5a93a9450bc9e9e7923f745d9.tar.gz |
Merge tag 'asoc-v3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.11
A fix to make sure userspace knows when control writes have caused a
change in value, fixing some UIs, plus a few few driver fixes mainly
cleaning up issues from recent refactorings on less mainstream platforms.
Diffstat (limited to 'arch/alpha/include/asm/param.h')
-rw-r--r-- | arch/alpha/include/asm/param.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/alpha/include/asm/param.h b/arch/alpha/include/asm/param.h index bf46af51941b..a5b68b268bcf 100644 --- a/arch/alpha/include/asm/param.h +++ b/arch/alpha/include/asm/param.h @@ -3,7 +3,9 @@ #include <uapi/asm/param.h> -#define HZ CONFIG_HZ -#define USER_HZ HZ -# define CLOCKS_PER_SEC HZ /* frequency at which times() counts */ +# undef HZ +# define HZ CONFIG_HZ +# define USER_HZ 1024 +# define CLOCKS_PER_SEC USER_HZ /* frequency at which times() counts */ + #endif /* _ASM_ALPHA_PARAM_H */ |