diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 18:59:57 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 18:59:57 +0200 |
| commit | fefd26b3b8597a11a422d950c0d4424ff33a70ad (patch) | |
| tree | 6794a36072635e71e5b33aec47c616bafdca65c1 /include/asm-powerpc | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6 (diff) | |
| parent | Remove all inclusions of <linux/config.h> (diff) | |
| download | linux-fefd26b3b8597a11a422d950c0d4424ff33a70ad.tar.xz linux-fefd26b3b8597a11a422d950c0d4424ff33a70ad.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/configh
* master.kernel.org:/pub/scm/linux/kernel/git/davej/configh:
Remove all inclusions of <linux/config.h>
Manually resolved trivial path conflicts due to removed files in
the sound/oss/ subdirectory.
Diffstat (limited to 'include/asm-powerpc')
| -rw-r--r-- | include/asm-powerpc/irq.h | 1 | ||||
| -rw-r--r-- | include/asm-powerpc/pci-bridge.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-powerpc/irq.h b/include/asm-powerpc/irq.h index 4da41efb1319..89ed545b446b 100644 --- a/include/asm-powerpc/irq.h +++ b/include/asm-powerpc/irq.h @@ -9,7 +9,6 @@ * 2 of the License, or (at your option) any later version. */ -#include <linux/config.h> #include <linux/threads.h> #include <linux/list.h> #include <linux/radix-tree.h> diff --git a/include/asm-powerpc/pci-bridge.h b/include/asm-powerpc/pci-bridge.h index 4f55573762bb..86ee46b09b8a 100644 --- a/include/asm-powerpc/pci-bridge.h +++ b/include/asm-powerpc/pci-bridge.h @@ -6,7 +6,6 @@ #include <asm-ppc/pci-bridge.h> #else -#include <linux/config.h> #include <linux/pci.h> #include <linux/list.h> |