Commit a63b8783 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'regmap/topic/ac97' and 'regmap/topic/headers' into regmap-next

parents c6efe576 22853223 e39be3a3

drivers/base/regmap/Kconfig

+4 −1
Original line number Diff line number Diff line
@@ -3,12 +3,15 @@ 
# subsystems should select the appropriate symbols.



config REGMAP

	default y if (REGMAP_I2C || REGMAP_SPI || REGMAP_SPMI || REGMAP_MMIO || REGMAP_IRQ)

	default y if (REGMAP_I2C || REGMAP_SPI || REGMAP_SPMI || REGMAP_AC97 || REGMAP_MMIO || REGMAP_IRQ)

	select LZO_COMPRESS

	select LZO_DECOMPRESS

	select IRQ_DOMAIN if REGMAP_IRQ

	bool



config REGMAP_AC97

	tristate



config REGMAP_I2C

	tristate

	depends on I2C

drivers/base/regmap/Makefile

+1 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_REGMAP) += regmap.o regcache.o

obj-$(CONFIG_REGMAP) += regcache-rbtree.o regcache-lzo.o regcache-flat.o

obj-$(CONFIG_DEBUG_FS) += regmap-debugfs.o

obj-$(CONFIG_REGMAP_AC97) += regmap-ac97.o

obj-$(CONFIG_REGMAP_I2C) += regmap-i2c.o

obj-$(CONFIG_REGMAP_SPI) += regmap-spi.o

obj-$(CONFIG_REGMAP_SPMI) += regmap-spmi.o

drivers/base/regmap/regcache-flat.c

+1 −1
Original line number Diff line number Diff line
@@ -10,9 +10,9 @@ 
 * published by the Free Software Foundation.

 */



#include <linux/slab.h>

#include <linux/device.h>

#include <linux/seq_file.h>

#include <linux/slab.h>



#include "internal.h"

drivers/base/regmap/regcache-lzo.c

+1 −1
Original line number Diff line number Diff line
@@ -10,9 +10,9 @@ 
 * published by the Free Software Foundation.

 */



#include <linux/slab.h>

#include <linux/device.h>

#include <linux/lzo.h>

#include <linux/slab.h>



#include "internal.h"

drivers/base/regmap/regcache-rbtree.c

+2 −2
Original line number Diff line number Diff line
@@ -10,11 +10,11 @@ 
 * published by the Free Software Foundation.

 */



#include <linux/slab.h>

#include <linux/device.h>

#include <linux/debugfs.h>

#include <linux/device.h>

#include <linux/rbtree.h>

#include <linux/seq_file.h>

#include <linux/slab.h>



#include "internal.h"

CRA Git | Maintained and supported by SUSTech CRA and CCSE