diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-30 20:36:49 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-30 20:36:49 -0500 |
| commit | 14a3c4ab0e58d143c7928c9eb2f2610205e13bf2 (patch) | |
| tree | 885992999d7a1a2fd3586efcf32ebcbcbc3a72aa /arch/arm/mach-s3c2412/clock.c | |
| parent | 1af237a099a3b8ff56aa384f605c6a68af7bf288 (diff) | |
| parent | 47992cbdaef2f18a47871b2ed01ad27f568c8b73 (diff) | |
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (407 commits)
[ARM] pxafb: add support for overlay1 and overlay2 as framebuffer devices
[ARM] pxafb: cleanup of the timing checking code
[ARM] pxafb: cleanup of the color format manipulation code
[ARM] pxafb: add palette format support for LCCR4_PAL_FOR_3
[ARM] pxafb: add support for FBIOPAN_DISPLAY by dma braching
[ARM] pxafb: allow pxafb_set_par() to start from arbitrary yoffset
[ARM] pxafb: allow video memory size to be configurable
[ARM] pxa: add document on the MFP design and how to use it
[ARM] sa1100_wdt: don't assume CLOCK_TICK_RATE to be a constant
[ARM] rtc-sa1100: don't assume CLOCK_TICK_RATE to be a constant
[ARM] pxa/tavorevb: update board support (smartpanel LCD + keypad)
[ARM] pxa: Update eseries defconfig
[ARM] 5352/1: add w90p910-plat config file
[ARM] s3c: S3C options should depend on PLAT_S3C
[ARM] mv78xx0: implement GPIO and GPIO interrupt support
[ARM] Kirkwood: implement GPIO and GPIO interrupt support
[ARM] Orion: share GPIO IRQ handling code
[ARM] Orion: share GPIO handling code
[ARM] s3c: define __io using the typesafe version
[ARM] S3C64XX: Ensure CPU_V6 is selected
...
Diffstat (limited to 'arch/arm/mach-s3c2412/clock.c')
| -rw-r--r-- | arch/arm/mach-s3c2412/clock.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/mach-s3c2412/clock.c b/arch/arm/mach-s3c2412/clock.c index 96d9eb15424f..a037df5e1c2d 100644 --- a/arch/arm/mach-s3c2412/clock.c +++ b/arch/arm/mach-s3c2412/clock.c | |||
| @@ -93,12 +93,6 @@ static int s3c2412_upll_enable(struct clk *clk, int enable) | |||
| 93 | 93 | ||
| 94 | /* clock selections */ | 94 | /* clock selections */ |
| 95 | 95 | ||
| 96 | /* CPU EXTCLK input */ | ||
| 97 | static struct clk clk_ext = { | ||
| 98 | .name = "extclk", | ||
| 99 | .id = -1, | ||
| 100 | }; | ||
| 101 | |||
| 102 | static struct clk clk_erefclk = { | 96 | static struct clk clk_erefclk = { |
| 103 | .name = "erefclk", | 97 | .name = "erefclk", |
| 104 | .id = -1, | 98 | .id = -1, |
| @@ -773,5 +767,6 @@ int __init s3c2412_baseclk_add(void) | |||
| 773 | s3c2412_clkcon_enable(clkp, 0); | 767 | s3c2412_clkcon_enable(clkp, 0); |
| 774 | } | 768 | } |
| 775 | 769 | ||
| 770 | s3c_pwmclk_init(); | ||
| 776 | return 0; | 771 | return 0; |
| 777 | } | 772 | } |