diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-25 06:44:44 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-25 06:44:44 -0400 |
| commit | 76a9f26c9e40e9c0ed5dc8f0cedd74e733f0088d (patch) | |
| tree | 8e2db4ba9263e92d264ef469c7dac28078f63874 /arch/arm/mach-s3c2410/s3c2410-clock.c | |
| parent | 9bf2aa129a107a0e9e2a5318d35aca731ae7e666 (diff) | |
| parent | dfd8317d3340f03bc06eba6b58f0ec0861da4a13 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'arch/arm/mach-s3c2410/s3c2410-clock.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/s3c2410-clock.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/s3c2410-clock.c b/arch/arm/mach-s3c2410/s3c2410-clock.c index fd17c60e1132..99718663318e 100644 --- a/arch/arm/mach-s3c2410/s3c2410-clock.c +++ b/arch/arm/mach-s3c2410/s3c2410-clock.c | |||
| @@ -182,7 +182,15 @@ static struct clk init_clocks[] = { | |||
| 182 | .id = -1, | 182 | .id = -1, |
| 183 | .parent = &clk_p, | 183 | .parent = &clk_p, |
| 184 | .ctrlbit = 0, | 184 | .ctrlbit = 0, |
| 185 | } | 185 | }, { |
| 186 | .name = "usb-bus-host", | ||
| 187 | .id = -1, | ||
| 188 | .parent = &clk_usb_bus, | ||
| 189 | }, { | ||
| 190 | .name = "usb-bus-gadget", | ||
| 191 | .id = -1, | ||
| 192 | .parent = &clk_usb_bus, | ||
| 193 | }, | ||
| 186 | }; | 194 | }; |
| 187 | 195 | ||
| 188 | /* s3c2410_baseclk_add() | 196 | /* s3c2410_baseclk_add() |