projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
[linux-2.6-block.git]
/
drivers
/
net
/
ethernet
/
ti
/
Kconfig
diff --git
a/drivers/net/ethernet/ti/Kconfig
b/drivers/net/ethernet/ti/Kconfig
index 3bc992cd70b7de4449afec00cdab816d9910ec22..f6a71092e1359ea095aad0aeca093065080ceb5c 100644
(file)
--- a/
drivers/net/ethernet/ti/Kconfig
+++ b/
drivers/net/ethernet/ti/Kconfig
@@
-50,7
+50,7
@@
config TI_DAVINCI_CPDMA
will be called davinci_cpdma. This is recommended.
config TI_CPSW_PHY_SEL
will be called davinci_cpdma. This is recommended.
config TI_CPSW_PHY_SEL
- bool
ean
"TI CPSW Switch Phy sel Support"
+ bool "TI CPSW Switch Phy sel Support"
depends on TI_CPSW
---help---
This driver supports configuring of the phy mode connected to
depends on TI_CPSW
---help---
This driver supports configuring of the phy mode connected to
@@
-77,7
+77,7
@@
config TI_CPSW
will be called cpsw.
config TI_CPTS
will be called cpsw.
config TI_CPTS
- bool
ean
"TI Common Platform Time Sync (CPTS) Support"
+ bool "TI Common Platform Time Sync (CPTS) Support"
depends on TI_CPSW
select PTP_1588_CLOCK
---help---
depends on TI_CPSW
select PTP_1588_CLOCK
---help---