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/arm/mach-ixp4xx/nslu2-pci.c | |
| parent | 34c162f79e374556dd1384437f0dab558b5dc657 (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
Merge branch 'master' of /home/sam/kernel/linux-2.6/
Diffstat (limited to 'arch/arm/mach-ixp4xx/nslu2-pci.c')
| -rw-r--r-- | arch/arm/mach-ixp4xx/nslu2-pci.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-ixp4xx/nslu2-pci.c b/arch/arm/mach-ixp4xx/nslu2-pci.c index ece860444d5b..0de639d6e60a 100644 --- a/arch/arm/mach-ixp4xx/nslu2-pci.c +++ b/arch/arm/mach-ixp4xx/nslu2-pci.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * | 15 | * |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/pci.h> | 18 | #include <linux/pci.h> |
| 20 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 21 | 20 | ||