diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 11:54:28 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 11:54:28 -0400 |
| commit | 6ebfc0e20b409f13e62bbb84ce70102b49945cfd (patch) | |
| tree | 67fea9b9c039ba47f96c7d51d8b2959b35543edf /arch/sh/drivers/pci/pci-sh7780.c | |
| parent | 1e9abb5b1dc90cfcf0e6f1e10f7aaf34d0f33b6b (diff) | |
| parent | fac99d97469e7f91102f97101bea620e5f073196 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: Fixup __raw_read_trylock().
sh: Kill off remaining config.h references.
sh: Initial gitignore list
sh: build fixes for defconfigs.
sh: Kill off more dead headers.
sh: Set pclk default for SH7705.
sh: defconfig updates.
Diffstat (limited to 'arch/sh/drivers/pci/pci-sh7780.c')
| -rw-r--r-- | arch/sh/drivers/pci/pci-sh7780.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/sh/drivers/pci/pci-sh7780.c b/arch/sh/drivers/pci/pci-sh7780.c index bd3064a82087..d6e635296534 100644 --- a/arch/sh/drivers/pci/pci-sh7780.c +++ b/arch/sh/drivers/pci/pci-sh7780.c | |||
| @@ -12,10 +12,8 @@ | |||
| 12 | * License. See linux/COPYING for more information. | 12 | * License. See linux/COPYING for more information. |
| 13 | * | 13 | * |
| 14 | */ | 14 | */ |
| 15 | |||
| 16 | #undef DEBUG | 15 | #undef DEBUG |
| 17 | 16 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/types.h> | 17 | #include <linux/types.h> |
| 20 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 21 | #include <linux/init.h> | 19 | #include <linux/init.h> |