diff options
| author | Pekka Enberg <penberg@kernel.org> | 2010-10-24 12:57:05 -0400 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2010-10-24 12:57:05 -0400 |
| commit | 6d4121f6c20a0e86231d52f535f1c82423b3326f (patch) | |
| tree | 5c235cac699ca86b504850aa663ddadde0455a61 /lib/dma-debug.c | |
| parent | 92a5bbc11ff2442a54b2f1d313088c245828ef4e (diff) | |
| parent | 35da7a307c535f9c2929cae277f3df425c9f9b1e (diff) | |
Merge branch 'master' into for-linus
Conflicts:
include/linux/percpu.h
mm/percpu.c
Diffstat (limited to 'lib/dma-debug.c')
| -rw-r--r-- | lib/dma-debug.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/dma-debug.c b/lib/dma-debug.c index 01e64270e246..4bfb0471f106 100644 --- a/lib/dma-debug.c +++ b/lib/dma-debug.c | |||
| @@ -590,6 +590,7 @@ out_unlock: | |||
| 590 | static const struct file_operations filter_fops = { | 590 | static const struct file_operations filter_fops = { |
| 591 | .read = filter_read, | 591 | .read = filter_read, |
| 592 | .write = filter_write, | 592 | .write = filter_write, |
| 593 | .llseek = default_llseek, | ||
| 593 | }; | 594 | }; |
| 594 | 595 | ||
| 595 | static int dma_debug_fs_init(void) | 596 | static int dma_debug_fs_init(void) |