Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

Pull i2c fix from Wolfram Sang:
"Bugfix for the AT24 EEPROM driver"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
misc: eeprom: at24: fix NVMEM name with custom AT24 device name

Changed files
-1
drivers
misc
eeprom
-1
drivers/misc/eeprom/at24.c
··· 736 736 737 737 nvmem_config.type = NVMEM_TYPE_EEPROM; 738 738 nvmem_config.dev = dev; 739 - nvmem_config.id = NVMEM_DEVID_AUTO; 740 739 nvmem_config.read_only = !writable; 741 740 nvmem_config.root_only = !(flags & AT24_FLAG_IRUGO); 742 741 nvmem_config.owner = THIS_MODULE;