diff options
| author | Sam Ravnborg <sam@mars.ravnborg.org> | 2006-07-03 17:24:23 -0400 |
|---|---|---|
| committer | Sam Ravnborg <sam@mars.ravnborg.org> | 2006-07-03 17:24:23 -0400 |
| commit | 05668381140309088443bf5dc53add4104610fbb (patch) | |
| tree | ed53039717390e1a71ff16209281b1f1c8d3e6be /arch/ia64/kernel/acpi.c | |
| parent | 34c162f79e374556dd1384437f0dab558b5dc657 (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
Merge branch 'master' of /home/sam/kernel/linux-2.6/
Diffstat (limited to 'arch/ia64/kernel/acpi.c')
| -rw-r--r-- | arch/ia64/kernel/acpi.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c index ca16d9556bde..ccdef199d915 100644 --- a/arch/ia64/kernel/acpi.c +++ b/arch/ia64/kernel/acpi.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | 32 | * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
| 33 | */ | 33 | */ |
| 34 | 34 | ||
| 35 | #include <linux/config.h> | ||
| 36 | #include <linux/module.h> | 35 | #include <linux/module.h> |
| 37 | #include <linux/init.h> | 36 | #include <linux/init.h> |
| 38 | #include <linux/kernel.h> | 37 | #include <linux/kernel.h> |