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/alpha/lib | |
| parent | 34c162f79e374556dd1384437f0dab558b5dc657 (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
Merge branch 'master' of /home/sam/kernel/linux-2.6/
Diffstat (limited to 'arch/alpha/lib')
| -rw-r--r-- | arch/alpha/lib/callback_srm.S | 1 | ||||
| -rw-r--r-- | arch/alpha/lib/udelay.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/alpha/lib/callback_srm.S b/arch/alpha/lib/callback_srm.S index 0528acd0d9ad..8804bec2c644 100644 --- a/arch/alpha/lib/callback_srm.S +++ b/arch/alpha/lib/callback_srm.S | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * arch/alpha/lib/callback_srm.S | 2 | * arch/alpha/lib/callback_srm.S |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <asm/console.h> | 5 | #include <asm/console.h> |
| 7 | 6 | ||
| 8 | .text | 7 | .text |
diff --git a/arch/alpha/lib/udelay.c b/arch/alpha/lib/udelay.c index 1c879bbce419..69d52aa37bae 100644 --- a/arch/alpha/lib/udelay.c +++ b/arch/alpha/lib/udelay.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Delay routines, using a pre-computed "loops_per_jiffy" value. | 4 | * Delay routines, using a pre-computed "loops_per_jiffy" value. |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/module.h> | 7 | #include <linux/module.h> |
| 9 | #include <linux/sched.h> /* for udelay's use of smp_processor_id */ | 8 | #include <linux/sched.h> /* for udelay's use of smp_processor_id */ |
| 10 | #include <asm/param.h> | 9 | #include <asm/param.h> |