Merge tag 'cris-changes-for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris

/* Copy to userspace.  This is based on the memcpy used for

   kernel-to-kernel copying; see "string.c".  */

unsigned long

__copy_user (void __user *pdst, const void *psrc, unsigned long pn)

unsigned long __copy_user(void __user *pdst, const void *psrc, unsigned long pn)

{

  /* We want the parameters put in special registers.

     Make sure the compiler is able to make something useful of this.

  return retn;

}

EXPORT_SYMBOL(__copy_user);

/* Copy from user to kernel, zeroing the bytes that were inaccessible in

   userland.  The return-value is the number of bytes that were

   inaccessible.  */

unsigned long

__copy_user_zeroing(void *pdst, const void __user *psrc, unsigned long pn)

unsigned long __copy_user_zeroing(void *pdst, const void __user *psrc,

				  unsigned long pn)

{

  /* We want the parameters put in special registers.

     Make sure the compiler is able to make something useful of this.

  return retn + n;

}

EXPORT_SYMBOL(__copy_user_zeroing);

/* Zero userspace.  */

unsigned long

__do_clear_user (void __user *pto, unsigned long pn)

unsigned long __do_clear_user(void __user *pto, unsigned long pn)

{

  /* We want the parameters put in special registers.

     Make sure the compiler is able to make something useful of this.

  return retn;

}

EXPORT_SYMBOL(__do_clear_user);

	select MTD_JEDECPROBE

	select MTD_BLOCK

	select MTD_COMPLEX_MAPPINGS

	select MTD_MTDRAM

	help

	  This option enables MTD mapping of flash devices.  Needed to use

	  flash memories.  If unsure, say Y.

	default MMC

	select SPI

	select MMC_SPI

	select ETRAX_SPI_MMC_BOARD

# For the parts that can't be a module (due to restrictions in

# framework elsewhere).

config ETRAX_SPI_MMC_BOARD

       boolean

       default n

# While the board info is MMC_SPI only, the drivers are written to be

# independent of MMC_SPI, so we'll keep SPI non-dependent on the

obj-$(CONFIG_ETRAX_I2C)			+= i2c.o

obj-$(CONFIG_ETRAX_SYNCHRONOUS_SERIAL)	+= sync_serial.o

obj-$(CONFIG_PCI)			+= pci/

obj-$(CONFIG_ETRAX_SPI_MMC_BOARD)	+= board_mmcspi.o

#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);