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/ppp_defs.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/ppp_defs.h')
| -rw-r--r-- | include/linux/ppp_defs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/ppp_defs.h b/include/linux/ppp_defs.h index 1c866bda2018..0f93ed6b4a88 100644 --- a/include/linux/ppp_defs.h +++ b/include/linux/ppp_defs.h | |||
| @@ -177,8 +177,8 @@ struct ppp_comp_stats { | |||
| 177 | * the last NP packet was sent or received. | 177 | * the last NP packet was sent or received. |
| 178 | */ | 178 | */ |
| 179 | struct ppp_idle { | 179 | struct ppp_idle { |
| 180 | time_t xmit_idle; /* time since last NP packet sent */ | 180 | __kernel_time_t xmit_idle; /* time since last NP packet sent */ |
| 181 | time_t recv_idle; /* time since last NP packet received */ | 181 | __kernel_time_t recv_idle; /* time since last NP packet received */ |
| 182 | }; | 182 | }; |
| 183 | 183 | ||
| 184 | #endif /* _PPP_DEFS_H_ */ | 184 | #endif /* _PPP_DEFS_H_ */ |