diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-09 18:08:37 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-09 18:08:37 -0500 |
| commit | a90fcf311199b0199e94e78fca899abf2aeb852b (patch) | |
| tree | 0b916c9f11006d4452eefa2013a4c63a9ed4d43f /arch/sparc64/kernel/ds.c | |
| parent | c5b875e354a54e2b5ba24eecae69bf94e025edd5 (diff) | |
| parent | 6f78a19702574008bbd333237380fa85be1c9e5d (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Use "is_power_of_2" macro for simplicity.
[SPARC]: Remove duplicate includes.
Diffstat (limited to 'arch/sparc64/kernel/ds.c')
| -rw-r--r-- | arch/sparc64/kernel/ds.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/ds.c b/arch/sparc64/kernel/ds.c index 9f472a79d37e..eeb5a2fc788d 100644 --- a/arch/sparc64/kernel/ds.c +++ b/arch/sparc64/kernel/ds.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | #include <linux/kernel.h> | 6 | #include <linux/kernel.h> |
| 7 | #include <linux/module.h> | 7 | #include <linux/module.h> |
| 8 | #include <linux/types.h> | 8 | #include <linux/types.h> |
| 9 | #include <linux/module.h> | ||
| 10 | #include <linux/string.h> | 9 | #include <linux/string.h> |
| 11 | #include <linux/slab.h> | 10 | #include <linux/slab.h> |
| 12 | #include <linux/sched.h> | 11 | #include <linux/sched.h> |