diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-01 13:05:40 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-01 13:05:40 -0800 |
| commit | 13dda80e48439b446d0bc9bab34b91484bc8f533 (patch) | |
| tree | e8037122d65fe2a5dd8f633a7648b2597640a2ce /drivers/net/Kconfig | |
| parent | 379e3a820da171cb1d97e8dccd736a69cebfb7c0 (diff) | |
| parent | 5f19daa16ffca55db5b0253eba2bd0f71ee7f7f4 (diff) | |
| download | kernel_samsung_smdk4412-13dda80e48439b446d0bc9bab34b91484bc8f533.zip kernel_samsung_smdk4412-13dda80e48439b446d0bc9bab34b91484bc8f533.tar.gz kernel_samsung_smdk4412-13dda80e48439b446d0bc9bab34b91484bc8f533.tar.bz2 | |
Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci
* 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci: (40 commits)
DaVinci DM365: Adding support for SPI EEPROM
DaVinci DM365: Adding DM365 SPI support
DaVinci DM355: Modifications to DM355 SPI support
DaVinci: SPI: Adding header file for SPI support.
davinci: dm646x: CDCE clocks: davinci_clk converted to clk_lookup
davinci: clkdev cleanup: remove clk_lookup wrapper, use clkdev_add_table()
DaVinci: DM365: Voice codec support for the DM365 SoC
davinci: clock: let clk->set_rate function sleep
Add SDA and SCL pin numbers to i2c platform data
davinci: da8xx/omap-l1xx: Add EDMA platform data for da850/omap-l138
davinci: build list of unused EDMA events dynamically
davinci: Fix edma_alloc_channel api for EDMA_CHANNEL_ANY case
davinci: Keep count of channel controllers on a platform
davinci: Correct return value of edma_alloc_channel api
davinci: add CDCE949 support on DM6467 EVM
davinci: add support for CDCE949 clock synthesizer
davinci: da850/omap-l138 EVM: register for suspend support
davinci: da850/omap-l138: add support for SoC suspend
davinci: add power management support
DaVinci: DM365: Changing default queue for DM365.
...
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index dd9a09c..1830062 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -920,7 +920,7 @@ config NET_NETX config TI_DAVINCI_EMAC tristate "TI DaVinci EMAC Support" - depends on ARM && ARCH_DAVINCI + depends on ARM && ( ARCH_DAVINCI || ARCH_OMAP3 ) select PHYLIB help This driver supports TI's DaVinci Ethernet . |