diff options
| author | Balaji Rao <balajirrao@openmoko.org> | 2009-01-27 14:38:44 +0000 |
|---|---|---|
| committer | Andy Green <agreen@octopus.localdomain> | 2009-01-27 14:38:44 +0000 |
| commit | 0c3f9b02b0fd87a0f07ff9f7d9e5afd6d1c52ebc (patch) | |
| tree | f64efcddaadfb0994af1ecd4171180bfe9319571 /include | |
| parent | 5619c333227a8525c8e0cac42cbd80eb0b670708 (diff) | |
rebase on .29-rc1 (was glamo xrandr bug)
On Wed, Jan 21, 2009 at 08:51:41PM +0000, Andy Green wrote:
> Today I got Ben Dooks to uplevel his tree to 29-rc1, I am rebasing it
> tonight, but ssh access to git.openmoko.org git:// is broken right now.
>
Oh, I forgot! Then you might encounter the pcf50633 driver from upstream
which has lots of differences from what we have on andy-tracking. So,
here I'm attaching a patch that applies to current andy-tracking which
is how the pcf50633/mach-gta02.c should look like after rebase. You can
probaly look into it in case of confusion..
Or you can apply it before rebase ? Probably you can..
Hope it helps,
Balaji
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/glamofb.h | 6 | ||||
| -rw-r--r-- | include/linux/jbt6k74.h | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/glamofb.h b/include/linux/glamofb.h index 38b93de6690..507b67c8099 100644 --- a/include/linux/glamofb.h +++ b/include/linux/glamofb.h @@ -27,9 +27,11 @@ struct glamofb_platform_data { struct glamo_spigpio_info *spigpio_info; struct glamo_core *glamo; + struct platform_device *mmc_dev; + /* glamo mmc platform specific info */ - void (*glamo_set_mci_power)(unsigned char power_mode, - unsigned short vdd); + int (*glamo_can_set_mci_power)(void); + /* glamo-mci asking if it should use the slow clock to card */ int (*glamo_mci_use_slow)(void); int (*glamo_irq_is_wired)(void); diff --git a/include/linux/jbt6k74.h b/include/linux/jbt6k74.h index 50e39347c20..962b3fbe04a 100644 --- a/include/linux/jbt6k74.h +++ b/include/linux/jbt6k74.h @@ -6,6 +6,7 @@ struct jbt6k74_platform_data { void (*reset)(int devindex, int level); void (*resuming)(int devindex); /* called when LCM is resumed */ + void (*probe_completed)(struct device *dev); }; #endif |