diff options
author | Andy Green <andy@openmoko.com> | 2008-11-19 17:11:11 +0000 |
---|---|---|
committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-11-19 17:11:11 +0000 |
commit | f39594d4998c1b4e7fb4de3a5d5936f5966499a8 (patch) | |
tree | 2b806a8c7f8dcb9f4a5e0b316cafbcc4ef3f0b12 /include/linux | |
parent | 105a84e9504f7a35b5b4d2c2560d86937bc4027d (diff) |
fix-remove-resume-dependencies-on-pmu-for-pmu-children.patch
All that stuff should be enforced by device tree now, out with it
Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/glamofb.h | 5 | ||||
-rw-r--r-- | include/linux/jbt6k74.h | 2 |
2 files changed, 0 insertions, 7 deletions
diff --git a/include/linux/glamofb.h b/include/linux/glamofb.h index ca63355d43b..1e760dc3517 100644 --- a/include/linux/glamofb.h +++ b/include/linux/glamofb.h @@ -2,7 +2,6 @@ #define _LINUX_GLAMOFB_H #include <linux/spi/glamo.h> -#include <linux/resume-dependency.h> struct glamofb_val { unsigned int defval; @@ -34,14 +33,10 @@ struct glamofb_platform_data { /* glamo-mci asking if it should use the slow clock to card */ int (*glamo_mci_use_slow)(void); int (*glamo_irq_is_wired)(void); - void (*mci_suspending)(struct platform_device *dev); - int (*mci_all_dependencies_resumed)(struct platform_device *dev); }; int glamofb_cmd_mode(struct glamofb_handle *gfb, int on); int glamofb_cmd_write(struct glamofb_handle *gfb, u_int16_t val); void glamo_lcm_reset(int level); -extern void -glamo_register_resume_dependency(struct resume_dependency * resume_dependency); #endif diff --git a/include/linux/jbt6k74.h b/include/linux/jbt6k74.h index f0eaf398b13..50e39347c20 100644 --- a/include/linux/jbt6k74.h +++ b/include/linux/jbt6k74.h @@ -6,8 +6,6 @@ struct jbt6k74_platform_data { void (*reset)(int devindex, int level); void (*resuming)(int devindex); /* called when LCM is resumed */ - void (*suspending)(int devindex, struct spi_device *spi); - int (*all_dependencies_resumed)(int devindex); }; #endif |