diff options
| author | Jens Axboe <axboe@fb.com> | 2014-04-15 22:02:24 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-04-15 22:02:24 +0200 |
| commit | f89e0dd9d1a72fdf6b8958bcadfa6abf84f3cae0 (patch) | |
| tree | 6d4ca8c67dc22d1c81053392078588f9ab3804b5 /sound/oss/sound_config.h | |
| parent | block: replace IS_ERR and PTR_ERR with PTR_ERR_OR_ZERO (diff) | |
| parent | Linux 3.15-rc1 (diff) | |
| download | linux-f89e0dd9d1a72fdf6b8958bcadfa6abf84f3cae0.tar.xz linux-f89e0dd9d1a72fdf6b8958bcadfa6abf84f3cae0.zip | |
Merge tag 'v3.15-rc1' into for-3.16/core
We don't like this, but things have diverged with the blk-mq fixes
in 3.15-rc1. So merge it in.
Diffstat (limited to 'sound/oss/sound_config.h')
| -rw-r--r-- | sound/oss/sound_config.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/oss/sound_config.h b/sound/oss/sound_config.h index 9d35c4c65b9b..f2554ab78f5e 100644 --- a/sound/oss/sound_config.h +++ b/sound/oss/sound_config.h @@ -123,10 +123,6 @@ static inline int translate_mode(struct file *file) #include "sound_calls.h" #include "dev_table.h" -#ifndef DEB -#define DEB(x) -#endif - #ifndef DDB #define DDB(x) do {} while (0) #endif |