diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-30 23:45:41 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-30 23:45:41 -0400 |
| commit | 1c7da74c4aab595a994beb5fe728ebf0d0b41f59 (patch) | |
| tree | 64128abdf9550ebb51d8f3ee6732d7350b9c62f2 /drivers/net/fec_8xx | |
| parent | aebb1153ac54ddbbd3d3f0481a193f4bf0ead53b (diff) | |
| parent | 1bdfd554be94def718323659173517c5d4a69d25 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/net/fec_8xx')
| -rw-r--r-- | drivers/net/fec_8xx/fec_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/fec_8xx/fec_main.c b/drivers/net/fec_8xx/fec_main.c index 22ac2df1aeb0..e17a1449ee10 100644 --- a/drivers/net/fec_8xx/fec_main.c +++ b/drivers/net/fec_8xx/fec_main.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/mii.h> | 30 | #include <linux/mii.h> |
| 31 | #include <linux/ethtool.h> | 31 | #include <linux/ethtool.h> |
| 32 | #include <linux/bitops.h> | 32 | #include <linux/bitops.h> |
| 33 | #include <linux/dma-mapping.h> | ||
| 33 | 34 | ||
| 34 | #include <asm/8xx_immap.h> | 35 | #include <asm/8xx_immap.h> |
| 35 | #include <asm/pgtable.h> | 36 | #include <asm/pgtable.h> |
| @@ -37,7 +38,6 @@ | |||
| 37 | #include <asm/irq.h> | 38 | #include <asm/irq.h> |
| 38 | #include <asm/uaccess.h> | 39 | #include <asm/uaccess.h> |
| 39 | #include <asm/commproc.h> | 40 | #include <asm/commproc.h> |
| 40 | #include <asm/dma-mapping.h> | ||
| 41 | 41 | ||
| 42 | #include "fec_8xx.h" | 42 | #include "fec_8xx.h" |
| 43 | 43 | ||