diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/net/davinci_emac.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index dd9a09c72dff..18300625b05b 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -920,7 +920,7 @@ config NET_NETX | |||
| 920 | 920 | ||
| 921 | config TI_DAVINCI_EMAC | 921 | config TI_DAVINCI_EMAC |
| 922 | tristate "TI DaVinci EMAC Support" | 922 | tristate "TI DaVinci EMAC Support" |
| 923 | depends on ARM && ARCH_DAVINCI | 923 | depends on ARM && ( ARCH_DAVINCI || ARCH_OMAP3 ) |
| 924 | select PHYLIB | 924 | select PHYLIB |
| 925 | help | 925 | help |
| 926 | This driver supports TI's DaVinci Ethernet . | 926 | This driver supports TI's DaVinci Ethernet . |
diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c index 33c4fe26178c..9ebac35d3af0 100644 --- a/drivers/net/davinci_emac.c +++ b/drivers/net/davinci_emac.c | |||
| @@ -62,12 +62,11 @@ | |||
| 62 | #include <linux/bitops.h> | 62 | #include <linux/bitops.h> |
| 63 | #include <linux/io.h> | 63 | #include <linux/io.h> |
| 64 | #include <linux/uaccess.h> | 64 | #include <linux/uaccess.h> |
| 65 | #include <linux/davinci_emac.h> | ||
| 65 | 66 | ||
| 66 | #include <asm/irq.h> | 67 | #include <asm/irq.h> |
| 67 | #include <asm/page.h> | 68 | #include <asm/page.h> |
| 68 | 69 | ||
| 69 | #include <mach/emac.h> | ||
| 70 | |||
| 71 | static int debug_level; | 70 | static int debug_level; |
| 72 | module_param(debug_level, int, 0); | 71 | module_param(debug_level, int, 0); |
| 73 | MODULE_PARM_DESC(debug_level, "DaVinci EMAC debug level (NETIF_MSG bits)"); | 72 | MODULE_PARM_DESC(debug_level, "DaVinci EMAC debug level (NETIF_MSG bits)"); |
