diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-21 13:28:24 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-21 13:28:24 +0200 |
| commit | 470fba7ebe60ad9185056b080b331abad24b4df9 (patch) | |
| tree | f83bc13d97adaf5dd0e0f1d6a157b890f868577f /drivers/net/arm/am79c961a.c | |
| parent | documentation: move mtrr.txt to Doc/x86/ subdir (diff) | |
| parent | Linux v2.6.27-rc4 (diff) | |
| download | linux-470fba7ebe60ad9185056b080b331abad24b4df9.tar.xz linux-470fba7ebe60ad9185056b080b331abad24b4df9.zip | |
Merge branch 'linus' into x86/doc
Diffstat (limited to 'drivers/net/arm/am79c961a.c')
| -rw-r--r-- | drivers/net/arm/am79c961a.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/arm/am79c961a.c b/drivers/net/arm/am79c961a.c index a637910b02dd..aa4a5246be53 100644 --- a/drivers/net/arm/am79c961a.c +++ b/drivers/net/arm/am79c961a.c @@ -28,7 +28,7 @@ #include <linux/bitops.h> #include <linux/platform_device.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include <asm/io.h> #include <asm/system.h> |