diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-10-27 18:21:36 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-10-27 18:30:18 +1100 |
| commit | 8b639e07efdb1b21ca60eeb3f8f5ac5038761200 (patch) | |
| tree | dd326f297c6c26c65477eea299667cf2d481fdd8 /drivers/staging/dream/gpio_event.c | |
| parent | 3a647a6ce4006ea8b84e4eaa6e18204cd911ed99 (diff) | |
| parent | 1f0f7a7df20bd69cb8553136613bda38dcddfcb1 (diff) | |
Merge branch 'quilt/staging'
Conflicts:
drivers/net/wireless/Kconfig
Diffstat (limited to 'drivers/staging/dream/gpio_event.c')
| -rw-r--r-- | drivers/staging/dream/gpio_event.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/staging/dream/gpio_event.c b/drivers/staging/dream/gpio_event.c index 8b64c1e579ba..e60e2c0db9c0 100644 --- a/drivers/staging/dream/gpio_event.c +++ b/drivers/staging/dream/gpio_event.c @@ -13,7 +13,7 @@ * */ -#include <linux/earlysuspend.h> + #include <linux/module.h> #include <linux/input.h> #include <linux/gpio_event.h> @@ -23,7 +23,6 @@ struct gpio_event { struct input_dev *input_dev; const struct gpio_event_platform_data *info; - struct early_suspend early_suspend; void *state[0]; }; |