diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-10-31 12:13:10 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-10-31 12:13:10 -0400 |
| commit | 7b3b6e42032e94a6132a85642e95106f5346650e (patch) | |
| tree | 8b2262291341d8a9f9b1e7e3c63a3289bb6c6de6 /include/media/sh_mobile_ceu.h | |
| parent | 04172c0b9ea5861e5cba7909da5297b3aedac9e1 (diff) | |
| parent | 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff) | |
Merge commit 'v2.6.28-rc2' into topic/asoc
Diffstat (limited to 'include/media/sh_mobile_ceu.h')
| -rw-r--r-- | include/media/sh_mobile_ceu.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/media/sh_mobile_ceu.h b/include/media/sh_mobile_ceu.h index 234a4711d2ec..b5dbefea3740 100644 --- a/include/media/sh_mobile_ceu.h +++ b/include/media/sh_mobile_ceu.h | |||
| @@ -5,8 +5,6 @@ | |||
| 5 | 5 | ||
| 6 | struct sh_mobile_ceu_info { | 6 | struct sh_mobile_ceu_info { |
| 7 | unsigned long flags; /* SOCAM_... */ | 7 | unsigned long flags; /* SOCAM_... */ |
| 8 | void (*enable_camera)(void); | ||
| 9 | void (*disable_camera)(void); | ||
| 10 | }; | 8 | }; |
| 11 | 9 | ||
| 12 | #endif /* __ASM_SH_MOBILE_CEU_H__ */ | 10 | #endif /* __ASM_SH_MOBILE_CEU_H__ */ |