diff options
| author | Minkyu Kang <mk7.kang@samsung.com> | 2010-03-23 19:09:13 +0900 |
|---|---|---|
| committer | Minkyu Kang <mk7.kang@samsung.com> | 2010-03-23 19:09:13 +0900 |
| commit | 45e565337a90bbca0c1bb712b5e008b7c0b18bd5 (patch) | |
| tree | 8bcaee16cda9d8f90f5b596566ad2122c6d8d86b /drivers/spi/davinci_spi.c | |
| parent | 995a4b1d83a08223c82c1e15778b02e85e5bba51 (diff) | |
| parent | d650da2dd4af99967aabc43cccbd8f160eb4cea6 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
cpu/arm920t/ep93xx/timer.c
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Diffstat (limited to 'drivers/spi/davinci_spi.c')
| -rw-r--r-- | drivers/spi/davinci_spi.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/spi/davinci_spi.c b/drivers/spi/davinci_spi.c index ebc7f8082ba..60ba007aaab 100644 --- a/drivers/spi/davinci_spi.c +++ b/drivers/spi/davinci_spi.c @@ -220,4 +220,3 @@ void spi_cs_deactivate(struct spi_slave *slave) { /* do nothing */ } - |