diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2008-02-03 02:29:41 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2008-02-03 02:30:32 -0500 |
| commit | c1f3ee120bb61045b1c0a3ead620d1d65af47130 (patch) | |
| tree | 908430bf2b47fe8e96ac623ae7ab6dd5698d0938 /include/asm-arm/arch-pxa/sharpsl.h | |
| parent | e619a75ff6201b567a539e787aa9af9bc63a3187 (diff) | |
| parent | 9135f1901ee6449dfe338adf6e40e9c2025b8150 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-arm/arch-pxa/sharpsl.h')
| -rw-r--r-- | include/asm-arm/arch-pxa/sharpsl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/arch-pxa/sharpsl.h b/include/asm-arm/arch-pxa/sharpsl.h index 2b0fe773213a..3b1d4a72d4d1 100644 --- a/include/asm-arm/arch-pxa/sharpsl.h +++ b/include/asm-arm/arch-pxa/sharpsl.h | |||
| @@ -16,7 +16,7 @@ int corgi_ssp_max1111_get(unsigned long data); | |||
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | struct corgits_machinfo { | 18 | struct corgits_machinfo { |
| 19 | unsigned long (*get_hsync_len)(void); | 19 | unsigned long (*get_hsync_invperiod)(void); |
| 20 | void (*put_hsync)(void); | 20 | void (*put_hsync)(void); |
| 21 | void (*wait_hsync)(void); | 21 | void (*wait_hsync)(void); |
| 22 | }; | 22 | }; |