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/m68k/mac | |
| parent | 34c162f79e374556dd1384437f0dab558b5dc657 (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
Merge branch 'master' of /home/sam/kernel/linux-2.6/
Diffstat (limited to 'arch/m68k/mac')
| -rw-r--r-- | arch/m68k/mac/config.c | 1 | ||||
| -rw-r--r-- | arch/m68k/mac/debug.c | 1 | ||||
| -rw-r--r-- | arch/m68k/mac/iop.c | 1 | ||||
| -rw-r--r-- | arch/m68k/mac/misc.c | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c index 5a9990e436b..85dda1095b1 100644 --- a/arch/m68k/mac/config.c +++ b/arch/m68k/mac/config.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | * Miscellaneous linux stuff | 10 | * Miscellaneous linux stuff |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | ||
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | #include <linux/types.h> | 14 | #include <linux/types.h> |
| 16 | #include <linux/mm.h> | 15 | #include <linux/mm.h> |
diff --git a/arch/m68k/mac/debug.c b/arch/m68k/mac/debug.c index cc62ed61cda..4eeb09dc0e8 100644 --- a/arch/m68k/mac/debug.c +++ b/arch/m68k/mac/debug.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * for more details. | 14 | * for more details. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/types.h> | 17 | #include <linux/types.h> |
| 19 | #include <linux/sched.h> | 18 | #include <linux/sched.h> |
| 20 | #include <linux/tty.h> | 19 | #include <linux/tty.h> |
diff --git a/arch/m68k/mac/iop.c b/arch/m68k/mac/iop.c index 4c8ece7e64a..bc657b1057a 100644 --- a/arch/m68k/mac/iop.c +++ b/arch/m68k/mac/iop.c | |||
| @@ -104,7 +104,6 @@ | |||
| 104 | * should execute quickly.) | 104 | * should execute quickly.) |
| 105 | */ | 105 | */ |
| 106 | 106 | ||
| 107 | #include <linux/config.h> | ||
| 108 | #include <linux/types.h> | 107 | #include <linux/types.h> |
| 109 | #include <linux/kernel.h> | 108 | #include <linux/kernel.h> |
| 110 | #include <linux/mm.h> | 109 | #include <linux/mm.h> |
diff --git a/arch/m68k/mac/misc.c b/arch/m68k/mac/misc.c index bbb0c3b95e9..56d1f5676ad 100644 --- a/arch/m68k/mac/misc.c +++ b/arch/m68k/mac/misc.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * Miscellaneous Mac68K-specific stuff | 2 | * Miscellaneous Mac68K-specific stuff |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/types.h> | 5 | #include <linux/types.h> |
| 7 | #include <linux/errno.h> | 6 | #include <linux/errno.h> |
| 8 | #include <linux/miscdevice.h> | 7 | #include <linux/miscdevice.h> |