diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
| commit | f630fe2817601314b2eb7ca5ddc23c7834646731 (patch) | |
| tree | 3bfb4939b7bbc3859575ca8b58fa3f929b015941 /init/calibrate.c | |
| parent | 48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (diff) | |
| parent | 8a03d9a498eaf02c8a118752050a5154852c13bf (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'init/calibrate.c')
| -rw-r--r-- | init/calibrate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/calibrate.c b/init/calibrate.c index d206c7548fe6..40ff3b404895 100644 --- a/init/calibrate.c +++ b/init/calibrate.c | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | * Copyright (C) 1991, 1992 Linus Torvalds | 4 | * Copyright (C) 1991, 1992 Linus Torvalds |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/sched.h> | 7 | #include <linux/jiffies.h> |
| 8 | #include <linux/delay.h> | 8 | #include <linux/delay.h> |
| 9 | #include <linux/init.h> | 9 | #include <linux/init.h> |
| 10 | 10 | ||