diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /arch/arm/mach-at91/clock.h | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'arch/arm/mach-at91/clock.h')
| -rw-r--r-- | arch/arm/mach-at91/clock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/clock.h b/arch/arm/mach-at91/clock.h index 1ba3b95ff359..6cf4b78e175d 100644 --- a/arch/arm/mach-at91/clock.h +++ b/arch/arm/mach-at91/clock.h | |||
| @@ -22,7 +22,7 @@ struct clk { | |||
| 22 | struct clk *parent; | 22 | struct clk *parent; |
| 23 | u32 pmc_mask; | 23 | u32 pmc_mask; |
| 24 | void (*mode)(struct clk *, int); | 24 | void (*mode)(struct clk *, int); |
| 25 | unsigned id:2; /* PCK0..3, or 32k/main/a/b */ | 25 | unsigned id:3; /* PCK0..4, or 32k/main/a/b */ |
| 26 | unsigned type; /* clock type */ | 26 | unsigned type; /* clock type */ |
| 27 | u16 users; | 27 | u16 users; |
| 28 | }; | 28 | }; |