Merge branch 'for-2.6.37' into for-2.6.38

[karo-tx-linux.git] / drivers / staging / octeon / Kconfig

diff --git a/drivers/staging/octeon/Kconfig b/drivers/staging/octeon/Kconfig
index 579b8f129e6e5ddd146454b7c09b74e1764f4f69..9493128e5fd2d7a743521781eddcd507622310a2 100644 (file)
--- a/drivers/staging/octeon/Kconfig
+++ b/drivers/staging/octeon/Kconfig
@@ -1,9 +1,8 @@
 config OCTEON_ETHERNET
        tristate "Cavium Networks Octeon Ethernet support"
-       depends on CPU_CAVIUM_OCTEON
+       depends on CPU_CAVIUM_OCTEON && NETDEVICES
        select PHYLIB
        select MDIO_OCTEON
-       select HIGH_RES_TIMERS
        help
          This driver supports the builtin ethernet ports on Cavium
          Networks' products in the Octeon family. This driver supports the