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 /drivers/char/nvram.c | |
| parent | 48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (diff) | |
| parent | 8a03d9a498eaf02c8a118752050a5154852c13bf (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/char/nvram.c')
| -rw-r--r-- | drivers/char/nvram.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c index a39f19c35a6a..204deaa0de80 100644 --- a/drivers/char/nvram.c +++ b/drivers/char/nvram.c | |||
| @@ -37,7 +37,6 @@ | |||
| 37 | #define NVRAM_VERSION "1.2" | 37 | #define NVRAM_VERSION "1.2" |
| 38 | 38 | ||
| 39 | #include <linux/module.h> | 39 | #include <linux/module.h> |
| 40 | #include <linux/sched.h> | ||
| 41 | #include <linux/smp_lock.h> | 40 | #include <linux/smp_lock.h> |
| 42 | #include <linux/nvram.h> | 41 | #include <linux/nvram.h> |
| 43 | 42 | ||