diff options
| author | Tom Rini <trini@konsulko.com> | 2018-12-05 15:06:24 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-12-05 15:06:24 -0500 |
| commit | 9450ab2ba8d720bd9f73bccc0af2e2b5a2c2aaf1 (patch) | |
| tree | b0566746ed9a8dd261e61113c19cf0a234a6417b /drivers/net | |
| parent | a77a8fde7bb850178c2e4ad3db354b536114ea32 (diff) | |
| parent | 08898e8b22d74a4511eadee9b06b11aab43e809c (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-spi
- Various MTD fixes from Boris
- Zap various unused / legacy paths.
- pxa3xx NAND update from Miquel
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/e1000_spi.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/e1000_spi.c b/drivers/net/e1000_spi.c index b38f4df9f3..aecd290d72 100644 --- a/drivers/net/e1000_spi.c +++ b/drivers/net/e1000_spi.c @@ -77,9 +77,6 @@ static inline struct e1000_hw *e1000_hw_from_spi(struct spi_slave *spi) return container_of(spi, struct e1000_hw, spi); } -/* Not sure why all of these are necessary */ -void spi_init(void) { /* Nothing to do */ } - struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, unsigned int max_hz, unsigned int mode) { |