diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-29 23:04:53 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-29 23:04:53 -0400 |
| commit | 9ff9a26b786c35ee8d2a66222924a807ec851a9f (patch) | |
| tree | db432a17bccca1ca2c16907f0ee83ac449ed4012 /include/linux/cyclades.h | |
| parent | 0a3108beea9143225119d5e7c72a8e2c64f3eb7d (diff) | |
| parent | 0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b (diff) | |
Merge commit 'origin/master' into next
Manual merge of:
arch/powerpc/include/asm/elf.h
drivers/i2c/busses/i2c-mpc.c
Diffstat (limited to 'include/linux/cyclades.h')
| -rw-r--r-- | include/linux/cyclades.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/cyclades.h b/include/linux/cyclades.h index d06fbf286346..788850ba4e75 100644 --- a/include/linux/cyclades.h +++ b/include/linux/cyclades.h | |||
| @@ -82,9 +82,9 @@ struct cyclades_monitor { | |||
| 82 | * open) | 82 | * open) |
| 83 | */ | 83 | */ |
| 84 | struct cyclades_idle_stats { | 84 | struct cyclades_idle_stats { |
| 85 | time_t in_use; /* Time device has been in use (secs) */ | 85 | __kernel_time_t in_use; /* Time device has been in use (secs) */ |
| 86 | time_t recv_idle; /* Time since last char received (secs) */ | 86 | __kernel_time_t recv_idle; /* Time since last char received (secs) */ |
| 87 | time_t xmit_idle; /* Time since last char transmitted (secs) */ | 87 | __kernel_time_t xmit_idle; /* Time since last char transmitted (secs) */ |
| 88 | unsigned long recv_bytes; /* Bytes received */ | 88 | unsigned long recv_bytes; /* Bytes received */ |
| 89 | unsigned long xmit_bytes; /* Bytes transmitted */ | 89 | unsigned long xmit_bytes; /* Bytes transmitted */ |
| 90 | unsigned long overruns; /* Input overruns */ | 90 | unsigned long overruns; /* Input overruns */ |