diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2010-07-03 19:15:08 +0200 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2010-07-03 19:15:08 +0200 |
| commit | aa0f646273035824cc033aa229380f1a27c0f4ed (patch) | |
| tree | 6677cf96bda9d316754bda07615f008ad87de6f4 /include/linux/mfd/glamo.h | |
| parent | 4ce5f33cd4bcde2e25d50ae0880eb39213e2b6d2 (diff) | |
| parent | 6650e90feca03fc8dc46fa4d8234f63377e7b80d (diff) | |
Merge branch 'glamo-2.6.34' into om-gta02-2.6.34om-gta02-2.6.34
Diffstat (limited to 'include/linux/mfd/glamo.h')
| -rw-r--r-- | include/linux/mfd/glamo.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/mfd/glamo.h b/include/linux/mfd/glamo.h index 529d4f07f03..ae52f3d4960 100644 --- a/include/linux/mfd/glamo.h +++ b/include/linux/mfd/glamo.h @@ -8,6 +8,8 @@ struct glamo_fb_platform_data; struct glamo_mmc_platform_data { int (*glamo_mmc_use_slow)(void); + unsigned nonremovable:1; + struct glamo_core *core; }; |