diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-07 13:45:22 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-07 13:45:22 -0500 |
| commit | 8995b161eb142b843094dd614b80e4cce1d66352 (patch) | |
| tree | ffd9988879441d5ec45ab96b2e06f4fcb1210158 /arch/arm/mach-s3c2410/clock.h | |
| parent | cc918c7ab7da017bfaf9661420bb5c462e057cfb (diff) | |
| parent | fe5dd7c73d328b255286b6b65ca19dd34447f709 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-s3c2410/clock.h')
| -rw-r--r-- | arch/arm/mach-s3c2410/clock.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/clock.h b/arch/arm/mach-s3c2410/clock.h index 7953b6f397b9..177d5c8decf7 100644 --- a/arch/arm/mach-s3c2410/clock.h +++ b/arch/arm/mach-s3c2410/clock.h | |||
| @@ -16,7 +16,6 @@ struct clk { | |||
| 16 | struct clk *parent; | 16 | struct clk *parent; |
| 17 | const char *name; | 17 | const char *name; |
| 18 | int id; | 18 | int id; |
| 19 | atomic_t used; | ||
| 20 | unsigned long rate; | 19 | unsigned long rate; |
| 21 | unsigned long ctrlbit; | 20 | unsigned long ctrlbit; |
| 22 | int (*enable)(struct clk *, int enable); | 21 | int (*enable)(struct clk *, int enable); |