Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 27952
b: refs/heads/master
c: a1b9298
h: refs/heads/master
v: v3
  • Loading branch information
David Woodhouse committed Apr 25, 2006
1 parent f7e0b87 commit 1437f8f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5a570cc0a41bd316afc91ba2c7151fed70d10b31
refs/heads/master: a1b9298e55d2395be4ac25de3340b6eee01c6f67
9 changes: 6 additions & 3 deletions trunk/include/linux/i2c.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,15 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
/* ------------------------------------------------------------------------- */

/* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and
/* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and
Frodo Looijaard <frodol@dds.nl> */

#ifndef _LINUX_I2C_H
#define _LINUX_I2C_H

#include <linux/module.h>
#include <linux/types.h>
#ifdef __KERNEL__
#include <linux/module.h>
#include <linux/i2c-id.h>
#include <linux/mod_devicetable.h>
#include <linux/device.h> /* for struct device */
Expand Down Expand Up @@ -354,6 +355,7 @@ static inline int i2c_adapter_id(struct i2c_adapter *adap)
{
return adap->nr;
}
#endif /* __KERNEL__ */

/*
* I2C Message - used for pure i2c transaction, also from /dev interface
Expand Down Expand Up @@ -469,6 +471,7 @@ union i2c_smbus_data {
#define I2C_SMBUS 0x0720 /* SMBus-level access */

/* ----- I2C-DEV: char device interface stuff ------------------------- */
#ifdef __KERNEL__

#define I2C_MAJOR 89 /* Device major number */

Expand Down Expand Up @@ -646,5 +649,5 @@ static unsigned short *forces[] = { force, force_##chip1, \
force_##chip6, force_##chip7, \
force_##chip8, NULL }; \
I2C_CLIENT_INSMOD_COMMON

#endif /* __KERNEL__ */
#endif /* _LINUX_I2C_H */

0 comments on commit 1437f8f

Please sign in to comment.