diff options
| author | Steve French <sfrench@us.ibm.com> | 2009-06-14 13:34:46 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-06-14 13:34:46 +0000 |
| commit | b70b92e41d95fd906f05f6e98f61209201495fa7 (patch) | |
| tree | 594890f30f1d89d54eccfd2780dfc033bd2fdd06 /include/linux | |
| parent | 1e68b2b2756fc3488ecbade5ad5f13302b3aaafc (diff) | |
| parent | 44b7532b8b464f606053562400719c9c21276037 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/atmel-mci.h | 2 | ||||
| -rw-r--r-- | include/linux/i2c-ocores.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/atmel-mci.h b/include/linux/atmel-mci.h index 2f1f95737acb..57b1846a3c87 100644 --- a/include/linux/atmel-mci.h +++ b/include/linux/atmel-mci.h @@ -10,6 +10,7 @@ * @bus_width: Number of data lines wired up the slot * @detect_pin: GPIO pin wired to the card detect switch * @wp_pin: GPIO pin wired to the write protect sensor + * @detect_is_active_high: The state of the detect pin when it is active * * If a given slot is not present on the board, @bus_width should be * set to 0. The other fields are ignored in this case. @@ -24,6 +25,7 @@ struct mci_slot_pdata { unsigned int bus_width; int detect_pin; int wp_pin; + bool detect_is_active_high; }; /** diff --git a/include/linux/i2c-ocores.h b/include/linux/i2c-ocores.h index 8ed591b0887e..4d5e57ff6614 100644 --- a/include/linux/i2c-ocores.h +++ b/include/linux/i2c-ocores.h @@ -14,6 +14,8 @@ struct ocores_i2c_platform_data { u32 regstep; /* distance between registers */ u32 clock_khz; /* input clock in kHz */ + u8 num_devices; /* number of devices in the devices list */ + struct i2c_board_info const *devices; /* devices connected to the bus */ }; #endif /* _LINUX_I2C_OCORES_H */ |