diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-10-30 04:43:08 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-10-30 04:43:08 -0400 |
| commit | 169ed55bd30305b933f52bfab32a58671d44ab68 (patch) | |
| tree | 32e280957474f458901abfce16fa2a1687ef7497 /drivers/idle/i7300_idle.c | |
| parent | 3d7851b3cdd43a734e5cc4c643fd886ab28ad4d5 (diff) | |
| parent | 45f81b1c96d9793e47ce925d257ea693ce0b193e (diff) | |
Merge branch 'tip/perf/jump-label-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
Diffstat (limited to 'drivers/idle/i7300_idle.c')
| -rw-r--r-- | drivers/idle/i7300_idle.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/idle/i7300_idle.c b/drivers/idle/i7300_idle.c index 15341fc1c68b..c976285d313e 100644 --- a/drivers/idle/i7300_idle.c +++ b/drivers/idle/i7300_idle.c | |||
| @@ -536,6 +536,7 @@ static ssize_t stats_read_ul(struct file *fp, char __user *ubuf, size_t count, | |||
| 536 | static const struct file_operations idle_fops = { | 536 | static const struct file_operations idle_fops = { |
| 537 | .open = stats_open_generic, | 537 | .open = stats_open_generic, |
| 538 | .read = stats_read_ul, | 538 | .read = stats_read_ul, |
| 539 | .llseek = default_llseek, | ||
| 539 | }; | 540 | }; |
| 540 | 541 | ||
| 541 | struct debugfs_file_info { | 542 | struct debugfs_file_info { |