mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
Merge master.kernel.org:/home/rmk/linux-2.6-arm
This commit is contained in:
commit
70ac551651
17 changed files with 870 additions and 129 deletions
|
|
@ -25,6 +25,8 @@
|
|||
/* Default Values */
|
||||
#define AKITA_IOEXP_IO_OUT (AKITA_IOEXP_IR_ON | AKITA_IOEXP_AKIN_PULLUP)
|
||||
|
||||
extern struct platform_device akitaioexp_device;
|
||||
|
||||
void akita_set_ioexp(struct device *dev, unsigned char bitmask);
|
||||
void akita_reset_ioexp(struct device *dev, unsigned char bitmask);
|
||||
|
||||
|
|
|
|||
|
|
@ -107,6 +107,7 @@
|
|||
#define I2C_DRIVERID_CX25840 71 /* cx2584x video encoder */
|
||||
#define I2C_DRIVERID_SAA7127 72 /* saa7124 video encoder */
|
||||
#define I2C_DRIVERID_SAA711X 73 /* saa711x video encoders */
|
||||
#define I2C_DRIVERID_AKITAIOEXP 74 /* IO Expander on Sharp SL-C1000 */
|
||||
|
||||
#define I2C_DRIVERID_EXP0 0xF0 /* experimental use id's */
|
||||
#define I2C_DRIVERID_EXP1 0xF1
|
||||
|
|
|
|||
Loading…
Reference in a new issue