diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-19 17:08:14 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-19 17:08:14 -0800 |
| commit | 971d9e07e18fa3684e7fbc932f01aa2a0682f232 (patch) | |
| tree | a927315124d4c96ba6673a20cddc74862a856a73 /arch/cris/arch-v32/drivers/i2c.h | |
| parent | Merge tag 'please-pull-misc-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux (diff) | |
| parent | CRISv32: Remove last remnants of ETRAX_SPI_MMC_BOARD (diff) | |
| download | linux-dev-971d9e07e18fa3684e7fbc932f01aa2a0682f232.tar.xz linux-dev-971d9e07e18fa3684e7fbc932f01aa2a0682f232.zip | |
Merge tag 'cris-changes-for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris
Pull arch/chris updates from Jesper Nilsson:
"Mostly cleanup and build fixes for CRISv32 allmodconfig
God Jul och Gott Nytt år!"
* tag 'cris-changes-for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris:
CRISv32: Remove last remnants of ETRAX_SPI_MMC_BOARD
CRISv32: ETRAXFS: Fix recursive spinlock
CRISv32: Select MTDRAM for axisflashmap
CRISv32: Implement early console
CRIS: Use KALLSYMs if available in call stack dump
CRISv32: Fix declaration mismatch
CRISv32: Rewrite of synchronous serial port driver
CRIS: Update init memory handling
CRISv32: Better handling of watchdog bite
CRIS: Export missing function symbols
CRIS: Export ioremap_nocache
CRIS: Fix headers_install
CRISv32: Add missing include for mm.h
CRISv32: Drop obsolete file for SPI driver
Diffstat (limited to 'arch/cris/arch-v32/drivers/i2c.h')
| -rw-r--r-- | arch/cris/arch-v32/drivers/i2c.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/cris/arch-v32/drivers/i2c.h b/arch/cris/arch-v32/drivers/i2c.h index c073cf4ba016..d9cc856f89fb 100644 --- a/arch/cris/arch-v32/drivers/i2c.h +++ b/arch/cris/arch-v32/drivers/i2c.h @@ -2,7 +2,6 @@ #include <linux/init.h> /* High level I2C actions */ -int __init i2c_init(void); int i2c_write(unsigned char theSlave, void *data, size_t nbytes); int i2c_read(unsigned char theSlave, void *data, size_t nbytes); int i2c_writereg(unsigned char theSlave, unsigned char theReg, unsigned char theValue); |