diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-06-17 02:59:01 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-17 02:59:10 -0400 |
| commit | cc4949e1fdade5d063e9f8783cf0e2cc92041ce5 (patch) | |
| tree | 4023bd641bfe464efbde518fb504d6865c9df014 /arch/arm/plat-omap/include/mach/hwa742.h | |
| parent | 28b4868820a56de661f54742ff91b78e12f1e582 (diff) | |
| parent | 300df7dc89cc276377fc020704e34875d5c473b6 (diff) | |
Merge branch 'linus' into x86/urgent
Merge reason: pull in latest to fix a bug in it.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/plat-omap/include/mach/hwa742.h')
| -rw-r--r-- | arch/arm/plat-omap/include/mach/hwa742.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/plat-omap/include/mach/hwa742.h b/arch/arm/plat-omap/include/mach/hwa742.h index 577f492f2d3c..886248d32b49 100644 --- a/arch/arm/plat-omap/include/mach/hwa742.h +++ b/arch/arm/plat-omap/include/mach/hwa742.h | |||
| @@ -2,10 +2,6 @@ | |||
| 2 | #define _HWA742_H | 2 | #define _HWA742_H |
| 3 | 3 | ||
| 4 | struct hwa742_platform_data { | 4 | struct hwa742_platform_data { |
| 5 | void (*power_up)(struct device *dev); | ||
| 6 | void (*power_down)(struct device *dev); | ||
| 7 | unsigned long (*get_clock_rate)(struct device *dev); | ||
| 8 | |||
| 9 | unsigned te_connected:1; | 5 | unsigned te_connected:1; |
| 10 | }; | 6 | }; |
| 11 | 7 | ||