diff options
| author | root <root@dyn-67.arm.linux.org.uk> | 2009-03-24 18:04:25 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-24 18:04:25 -0400 |
| commit | 9a38e989b8ce04923f919fc2a8a24eb07fb484e2 (patch) | |
| tree | 6b99638dc32b99420ada46ca8d1373ad7aa5a208 /drivers/net | |
| parent | 7d83f8fca517b123cf0136503a9e50974f65ec49 (diff) | |
| parent | 5fa82eb8ff06cd3ac4d64c6875922ae1dfa003c5 (diff) | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/smc91x.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h index 4d689b59c58c..1083e2c5dec6 100644 --- a/drivers/net/smc91x.h +++ b/drivers/net/smc91x.h | |||
| @@ -44,6 +44,7 @@ | |||
| 44 | defined(CONFIG_MACH_MAINSTONE) ||\ | 44 | defined(CONFIG_MACH_MAINSTONE) ||\ |
| 45 | defined(CONFIG_MACH_ZYLONITE) ||\ | 45 | defined(CONFIG_MACH_ZYLONITE) ||\ |
| 46 | defined(CONFIG_MACH_LITTLETON) ||\ | 46 | defined(CONFIG_MACH_LITTLETON) ||\ |
| 47 | defined(CONFIG_MACH_ZYLONITE2) ||\ | ||
| 47 | defined(CONFIG_ARCH_VIPER) | 48 | defined(CONFIG_ARCH_VIPER) |
| 48 | 49 | ||
| 49 | #include <asm/mach-types.h> | 50 | #include <asm/mach-types.h> |