diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-15 15:41:15 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-15 15:41:26 +0000 |
| commit | 9b963f32c38b4c7d2da667e4458967b550f30bee (patch) | |
| tree | be4ed36669fe831fe0d5feaddcc8dfb39809e32e /arch/arm/mach-davinci/include | |
| parent | 4c4070a3097fe9ef57af9ebca6f57a2c57bc6ff1 (diff) | |
| parent | 60d97a840175d3becb2e6de36537a5cdfc0ec3a9 (diff) | |
Merge branch 'davinci-next-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci into devel-stable
Diffstat (limited to 'arch/arm/mach-davinci/include')
| -rw-r--r-- | arch/arm/mach-davinci/include/mach/tnetv107x.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/include/mach/tnetv107x.h b/arch/arm/mach-davinci/include/mach/tnetv107x.h index 5a681d880dc..89c1fdc63c0 100644 --- a/arch/arm/mach-davinci/include/mach/tnetv107x.h +++ b/arch/arm/mach-davinci/include/mach/tnetv107x.h @@ -34,6 +34,7 @@ #include <linux/serial_8250.h> #include <linux/input/matrix_keypad.h> +#include <linux/mfd/ti_ssp.h> #include <mach/mmc.h> #include <mach/nand.h> @@ -44,6 +45,7 @@ struct tnetv107x_device_info { struct davinci_mmc_config *mmc_config[2]; /* 2 controllers */ struct davinci_nand_pdata *nand_config[4]; /* 4 chipsels */ struct matrix_keypad_platform_data *keypad_config; + struct ti_ssp_data *ssp_config; }; extern struct platform_device tnetv107x_wdt_device; |