diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2009-10-11 01:29:59 +0200 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2009-10-11 01:29:59 +0200 |
| commit | 4b1d11c8506ecc4f6f892f293177b2f4416f9b83 (patch) | |
| tree | de7dbdba9ee68e335ab9b899a7374a1f25033e52 /include/linux | |
| parent | c3738d6c639dbe1ec170666d76a1c1372ff77c0b (diff) | |
| parent | dda793e722a5db08345dbf642c7590c7eb61ab67 (diff) | |
Merge branch 'glamo-2.6.31' into om-gta02-2.6.31
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mfd/glamo.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/mfd/glamo.h b/include/linux/mfd/glamo.h index 566948b3cfc..529d4f07f03 100644 --- a/include/linux/mfd/glamo.h +++ b/include/linux/mfd/glamo.h @@ -8,7 +8,7 @@ struct glamo_fb_platform_data; struct glamo_mmc_platform_data { int (*glamo_mmc_use_slow)(void); - struct glamo_core *core; + struct glamo_core *core; }; struct glamo_gpio_platform_data { @@ -17,13 +17,13 @@ struct glamo_gpio_platform_data { }; struct glamo_platform_data { - struct glamo_fb_platform_data *fb_data; - struct glamo_mmc_platform_data *mmc_data; - struct glamo_gpio_platform_data *gpio_data; + struct glamo_fb_platform_data *fb_data; + struct glamo_mmc_platform_data *mmc_data; + struct glamo_gpio_platform_data *gpio_data; - unsigned int osci_clock_rate; + unsigned int osci_clock_rate; - void (*glamo_external_reset)(int); + void (*glamo_external_reset)(int); }; enum glamo_engine { |