r3132 - branches/src/target/kernel/2.6.23.x/patches
shoragan at sita.openmoko.org
shoragan at sita.openmoko.org
Tue Oct 9 17:49:28 CEST 2007
Author: shoragan
Date: 2007-10-09 17:49:27 +0200 (Tue, 09 Oct 2007)
New Revision: 3132
Modified:
branches/src/target/kernel/2.6.23.x/patches/s3c2410-pwm.patch
Log:
Update s3c2410-pwm.patch to apply on 2.6.23-rc9
Modified: branches/src/target/kernel/2.6.23.x/patches/s3c2410-pwm.patch
===================================================================
--- branches/src/target/kernel/2.6.23.x/patches/s3c2410-pwm.patch 2007-10-09 15:37:57 UTC (rev 3131)
+++ branches/src/target/kernel/2.6.23.x/patches/s3c2410-pwm.patch 2007-10-09 15:49:27 UTC (rev 3132)
@@ -1,16 +1,16 @@
-Index: linux-2.6.22.5-moko/arch/arm/mach-s3c2410/Kconfig
+Index: linux-2.6.23-rc9/arch/arm/mach-s3c2410/Kconfig
===================================================================
---- linux-2.6.22.5-moko.orig/arch/arm/mach-s3c2410/Kconfig
-+++ linux-2.6.22.5-moko/arch/arm/mach-s3c2410/Kconfig
+--- linux-2.6.23-rc9.orig/arch/arm/mach-s3c2410/Kconfig
++++ linux-2.6.23-rc9/arch/arm/mach-s3c2410/Kconfig
@@ -9,6 +9,7 @@
depends on ARCH_S3C2410
select S3C2410_CLOCK
select S3C2410_GPIO
+ select S3C2410_PWM
+ select CPU_LLSERIAL_S3C2410
select S3C2410_PM if PM
help
- Support for S3C2410 and S3C2410A family from the S3C24XX line
-@@ -36,6 +37,11 @@
+@@ -37,6 +38,11 @@
help
Clock code for the S3C2410, and similar processors
@@ -22,10 +22,10 @@
menu "S3C2410 Machines"
-Index: linux-2.6.22.5-moko/arch/arm/mach-s3c2410/Makefile
+Index: linux-2.6.23-rc9/arch/arm/mach-s3c2410/Makefile
===================================================================
---- linux-2.6.22.5-moko.orig/arch/arm/mach-s3c2410/Makefile
-+++ linux-2.6.22.5-moko/arch/arm/mach-s3c2410/Makefile
+--- linux-2.6.23-rc9.orig/arch/arm/mach-s3c2410/Makefile
++++ linux-2.6.23-rc9/arch/arm/mach-s3c2410/Makefile
@@ -16,6 +16,7 @@
obj-$(CONFIG_S3C2410_PM) += pm.o sleep.o
obj-$(CONFIG_S3C2410_GPIO) += gpio.o
@@ -34,10 +34,10 @@
# Machine support
-Index: linux-2.6.22.5-moko/arch/arm/mach-s3c2410/pwm.c
+Index: linux-2.6.23-rc9/arch/arm/mach-s3c2410/pwm.c
===================================================================
--- /dev/null
-+++ linux-2.6.22.5-moko/arch/arm/mach-s3c2410/pwm.c
++++ linux-2.6.23-rc9/arch/arm/mach-s3c2410/pwm.c
@@ -0,0 +1,222 @@
+/*
+ * arch/arm/mach-s3c2410/3c2410-pwm.c
@@ -261,10 +261,10 @@
+
+EXPORT_SYMBOL_GPL(s3c2410_pwm_dumpregs);
+
-Index: linux-2.6.22.5-moko/include/asm-arm/arch-s3c2410/pwm.h
+Index: linux-2.6.23-rc9/include/asm-arm/arch-s3c2410/pwm.h
===================================================================
--- /dev/null
-+++ linux-2.6.22.5-moko/include/asm-arm/arch-s3c2410/pwm.h
++++ linux-2.6.23-rc9/include/asm-arm/arch-s3c2410/pwm.h
@@ -0,0 +1,40 @@
+#ifndef __S3C2410_PWM_H
+#define __S3C2410_PWM_H
More information about the commitlog
mailing list