projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[cavium-octeon] update to 2.6.30-rc5
[openwrt.git]
/
target
/
linux
/
generic-2.6
/
patches-2.6.23
/
230-pps_support.patch
diff --git
a/target/linux/generic-2.6/patches-2.6.23/230-pps_support.patch
b/target/linux/generic-2.6/patches-2.6.23/230-pps_support.patch
index
a580df0
..
a532f41
100644
(file)
--- a/
target/linux/generic-2.6/patches-2.6.23/230-pps_support.patch
+++ b/
target/linux/generic-2.6/patches-2.6.23/230-pps_support.patch
@@
-1,7
+1,5
@@
-Index: linux-2.6.23.17/Documentation/pps/Makefile
-===================================================================
--- /dev/null
--- /dev/null
-+++
linux-2.6.23.17
/Documentation/pps/Makefile
++++
b
/Documentation/pps/Makefile
@@ -0,0 +1,27 @@
+TARGETS = ppstest ppsctl
+
@@ -0,0 +1,27 @@
+TARGETS = ppstest ppsctl
+
@@
-30,10
+28,8
@@
Index: linux-2.6.23.17/Documentation/pps/Makefile
+clean :
+ rm -f *.o *~ core .depend
+ rm -f ${TARGETS}
+clean :
+ rm -f *.o *~ core .depend
+ rm -f ${TARGETS}
-Index: linux-2.6.23.17/Documentation/pps/pps.txt
-===================================================================
--- /dev/null
--- /dev/null
-+++
linux-2.6.23.17
/Documentation/pps/pps.txt
++++
b
/Documentation/pps/pps.txt
@@ -0,0 +1,170 @@
+
+ PPS - Pulse Per Second
@@ -0,0 +1,170 @@
+
+ PPS - Pulse Per Second
@@
-205,10
+201,8
@@
Index: linux-2.6.23.17/Documentation/pps/pps.txt
+
+Please, note that to compile userland programs you need the file timepps.h
+(see Documentation/pps/).
+
+Please, note that to compile userland programs you need the file timepps.h
+(see Documentation/pps/).
-Index: linux-2.6.23.17/Documentation/pps/ppsctl.c
-===================================================================
--- /dev/null
--- /dev/null
-+++
linux-2.6.23.17
/Documentation/pps/ppsctl.c
++++
b
/Documentation/pps/ppsctl.c
@@ -0,0 +1,62 @@
+#include <stdio.h>
+#include <unistd.h>
@@ -0,0 +1,62 @@
+#include <stdio.h>
+#include <unistd.h>
@@
-272,10
+266,8
@@
Index: linux-2.6.23.17/Documentation/pps/ppsctl.c
+
+ return 0;
+}
+
+ return 0;
+}
-Index: linux-2.6.23.17/Documentation/pps/ppsfind
-===================================================================
--- /dev/null
--- /dev/null
-+++
linux-2.6.23.17
/Documentation/pps/ppsfind
++++
b
/Documentation/pps/ppsfind
@@ -0,0 +1,17 @@
+#!/bin/sh
+
@@ -0,0 +1,17 @@
+#!/bin/sh
+
@@
-294,10
+286,8
@@
Index: linux-2.6.23.17/Documentation/pps/ppsfind
+done
+
+exit 0
+done
+
+exit 0
-Index: linux-2.6.23.17/Documentation/pps/ppstest.c
-===================================================================
--- /dev/null
--- /dev/null
-+++
linux-2.6.23.17
/Documentation/pps/ppstest.c
++++
b
/Documentation/pps/ppstest.c
@@ -0,0 +1,151 @@
+#include <stdio.h>
+#include <stdlib.h>
@@ -0,0 +1,151 @@
+#include <stdio.h>
+#include <stdlib.h>
@@
-450,10
+440,8
@@
Index: linux-2.6.23.17/Documentation/pps/ppstest.c
+
+ return 0;
+}
+
+ return 0;
+}
-Index: linux-2.6.23.17/Documentation/pps/timepps.h
-===================================================================
--- /dev/null
--- /dev/null
-+++
linux-2.6.23.17
/Documentation/pps/timepps.h
++++
b
/Documentation/pps/timepps.h
@@ -0,0 +1,193 @@
+/*
+ * timepps.h -- PPS API main header
@@ -0,0 +1,193 @@
+/*
+ * timepps.h -- PPS API main header
@@
-648,10
+636,8
@@
Index: linux-2.6.23.17/Documentation/pps/timepps.h
+}
+
+#endif /* _SYS_TIMEPPS_H_ */
+}
+
+#endif /* _SYS_TIMEPPS_H_ */
-Index: linux-2.6.23.17/MAINTAINERS
-===================================================================
---- linux-2.6.23.17.orig/MAINTAINERS
-+++ linux-2.6.23.17/MAINTAINERS
+--- a/MAINTAINERS
++++ b/MAINTAINERS
@@ -3011,6 +3011,13 @@ P: James Chapman
M: jchapman@katalix.com
S: Maintained
@@ -3011,6 +3011,13 @@ P: James Chapman
M: jchapman@katalix.com
S: Maintained
@@
-666,10
+652,8
@@
Index: linux-2.6.23.17/MAINTAINERS
PREEMPTIBLE KERNEL
P: Robert Love
M: rml@tech9.net
PREEMPTIBLE KERNEL
P: Robert Love
M: rml@tech9.net
-Index: linux-2.6.23.17/drivers/Kconfig
-===================================================================
---- linux-2.6.23.17.orig/drivers/Kconfig
-+++ linux-2.6.23.17/drivers/Kconfig
+--- a/drivers/Kconfig
++++ b/drivers/Kconfig
@@ -52,6 +52,8 @@ source "drivers/i2c/Kconfig"
source "drivers/spi/Kconfig"
@@ -52,6 +52,8 @@ source "drivers/i2c/Kconfig"
source "drivers/spi/Kconfig"
@@
-679,10
+663,8
@@
Index: linux-2.6.23.17/drivers/Kconfig
source "drivers/w1/Kconfig"
source "drivers/power/Kconfig"
source "drivers/w1/Kconfig"
source "drivers/power/Kconfig"
-Index: linux-2.6.23.17/drivers/Makefile
-===================================================================
---- linux-2.6.23.17.orig/drivers/Makefile
-+++ linux-2.6.23.17/drivers/Makefile
+--- a/drivers/Makefile
++++ b/drivers/Makefile
@@ -63,6 +63,7 @@ obj-$(CONFIG_INPUT) += input/
obj-$(CONFIG_I2O) += message/
obj-$(CONFIG_RTC_LIB) += rtc/
@@ -63,6 +63,7 @@ obj-$(CONFIG_INPUT) += input/
obj-$(CONFIG_I2O) += message/
obj-$(CONFIG_RTC_LIB) += rtc/
@@
-691,10
+673,8
@@
Index: linux-2.6.23.17/drivers/Makefile
obj-$(CONFIG_W1) += w1/
obj-$(CONFIG_POWER_SUPPLY) += power/
obj-$(CONFIG_HWMON) += hwmon/
obj-$(CONFIG_W1) += w1/
obj-$(CONFIG_POWER_SUPPLY) += power/
obj-$(CONFIG_HWMON) += hwmon/
-Index: linux-2.6.23.17/drivers/char/lp.c
-===================================================================
---- linux-2.6.23.17.orig/drivers/char/lp.c
-+++ linux-2.6.23.17/drivers/char/lp.c
+--- a/drivers/char/lp.c
++++ b/drivers/char/lp.c
@@ -746,6 +746,27 @@ static struct console lpcons = {
#endif /* console on line printer */
@@ -746,6 +746,27 @@ static struct console lpcons = {
#endif /* console on line printer */
@@
-777,10
+757,8
@@
Index: linux-2.6.23.17/drivers/char/lp.c
}
static struct parport_driver lp_driver = {
}
static struct parport_driver lp_driver = {
-Index: linux-2.6.23.17/drivers/pps/Kconfig
-===================================================================
--- /dev/null
--- /dev/null
-+++
linux-2.6.23.17
/drivers/pps/Kconfig
++++
b
/drivers/pps/Kconfig
@@ -0,0 +1,34 @@
+#
+# PPS support configuration
@@ -0,0 +1,34 @@
+#
+# PPS support configuration
@@
-816,10
+794,8
@@
Index: linux-2.6.23.17/drivers/pps/Kconfig
+source drivers/pps/clients/Kconfig
+
+endmenu
+source drivers/pps/clients/Kconfig
+
+endmenu
-Index: linux-2.6.23.17/drivers/pps/Makefile
-===================================================================
--- /dev/null
--- /dev/null
-+++
linux-2.6.23.17
/drivers/pps/Makefile
++++
b
/drivers/pps/Makefile
@@ -0,0 +1,11 @@
+#
+# Makefile for the PPS core.
@@ -0,0 +1,11 @@
+#
+# Makefile for the PPS core.
@@
-832,10
+808,8
@@
Index: linux-2.6.23.17/drivers/pps/Makefile
+ifeq ($(CONFIG_PPS_DEBUG),y)
+EXTRA_CFLAGS += -DDEBUG
+endif
+ifeq ($(CONFIG_PPS_DEBUG),y)
+EXTRA_CFLAGS += -DDEBUG
+endif
-Index: linux-2.6.23.17/drivers/pps/clients/Kconfig
-===================================================================
--- /dev/null
--- /dev/null
-+++
linux-2.6.23.17
/drivers/pps/clients/Kconfig
++++
b
/drivers/pps/clients/Kconfig
@@ -0,0 +1,38 @@
+#
+# PPS clients configuration
@@ -0,0 +1,38 @@
+#
+# PPS clients configuration
@@
-875,10
+849,8
@@
Index: linux-2.6.23.17/drivers/pps/clients/Kconfig
+ with the interrupt pin of your parallel port.
+
+endif
+ with the interrupt pin of your parallel port.
+
+endif
-Index: linux-2.6.23.17/drivers/pps/clients/Makefile
-===================================================================
--- /dev/null
--- /dev/null
-+++
linux-2.6.23.17
/drivers/pps/clients/Makefile
++++
b
/drivers/pps/clients/Makefile
@@ -0,0 +1,9 @@
+#
+# Makefile for PPS clients.
@@ -0,0 +1,9 @@
+#
+# Makefile for PPS clients.
@@
-889,10
+861,8
@@
Index: linux-2.6.23.17/drivers/pps/clients/Makefile
+ifeq ($(CONFIG_PPS_DEBUG),y)
+EXTRA_CFLAGS += -DDEBUG
+endif
+ifeq ($(CONFIG_PPS_DEBUG),y)
+EXTRA_CFLAGS += -DDEBUG
+endif
-Index: linux-2.6.23.17/drivers/pps/clients/ktimer.c
-===================================================================
--- /dev/null
--- /dev/null
-+++
linux-2.6.23.17
/drivers/pps/clients/ktimer.c
++++
b
/drivers/pps/clients/ktimer.c
@@ -0,0 +1,114 @@
+/*
+ * ktimer.c -- kernel timer test client
@@ -0,0 +1,114 @@
+/*
+ * ktimer.c -- kernel timer test client
@@
-1008,10
+978,8
@@
Index: linux-2.6.23.17/drivers/pps/clients/ktimer.c
+MODULE_AUTHOR("Rodolfo Giometti <giometti@linux.it>");
+MODULE_DESCRIPTION("dummy PPS source by using a kernel timer (just for debug)");
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Rodolfo Giometti <giometti@linux.it>");
+MODULE_DESCRIPTION("dummy PPS source by using a kernel timer (just for debug)");
+MODULE_LICENSE("GPL");
-Index: linux-2.6.23.17/drivers/pps/kapi.c
-===================================================================
--- /dev/null
--- /dev/null
-+++
linux-2.6.23.17
/drivers/pps/kapi.c
++++
b
/drivers/pps/kapi.c
@@ -0,0 +1,271 @@
+/*
+ * kapi.c -- kernel API
@@ -0,0 +1,271 @@
+/*
+ * kapi.c -- kernel API
@@
-1284,10
+1252,8
@@
Index: linux-2.6.23.17/drivers/pps/kapi.c
+ spin_unlock_irqrestore(&idr_lock, flags);
+}
+EXPORT_SYMBOL(pps_event);
+ spin_unlock_irqrestore(&idr_lock, flags);
+}
+EXPORT_SYMBOL(pps_event);
-Index: linux-2.6.23.17/drivers/pps/pps.c
-===================================================================
--- /dev/null
--- /dev/null
-+++
linux-2.6.23.17
/drivers/pps/pps.c
++++
b
/drivers/pps/pps.c
@@ -0,0 +1,332 @@
+/*
+ * pps.c -- Main PPS support file
@@ -0,0 +1,332 @@
+/*
+ * pps.c -- Main PPS support file
@@
-1621,10
+1587,8
@@
Index: linux-2.6.23.17/drivers/pps/pps.c
+MODULE_AUTHOR("Rodolfo Giometti <giometti@linux.it>");
+MODULE_DESCRIPTION("LinuxPPS support (RFC 2783) - ver. " PPS_VERSION);
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Rodolfo Giometti <giometti@linux.it>");
+MODULE_DESCRIPTION("LinuxPPS support (RFC 2783) - ver. " PPS_VERSION);
+MODULE_LICENSE("GPL");
-Index: linux-2.6.23.17/drivers/pps/sysfs.c
-===================================================================
--- /dev/null
--- /dev/null
-+++
linux-2.6.23.17
/drivers/pps/sysfs.c
++++
b
/drivers/pps/sysfs.c
@@ -0,0 +1,124 @@
+/*
+ * sysfs.c -- sysfs support
@@ -0,0 +1,124 @@
+/*
+ * sysfs.c -- sysfs support
@@
-1750,10
+1714,8
@@
Index: linux-2.6.23.17/drivers/pps/sysfs.c
+
+ return 0;
+}
+
+ return 0;
+}
-Index: linux-2.6.23.17/drivers/serial/8250.c
-===================================================================
---- linux-2.6.23.17.orig/drivers/serial/8250.c
-+++ linux-2.6.23.17/drivers/serial/8250.c
+--- a/drivers/serial/8250.c
++++ b/drivers/serial/8250.c
@@ -2118,6 +2118,8 @@ serial8250_set_termios(struct uart_port
up->ier |= UART_IER_MSI;
if (up->capabilities & UART_CAP_UUE)
@@ -2118,6 +2118,8 @@ serial8250_set_termios(struct uart_port
up->ier |= UART_IER_MSI;
if (up->capabilities & UART_CAP_UUE)
@@
-1763,10
+1725,8
@@
Index: linux-2.6.23.17/drivers/serial/8250.c
serial_out(up, UART_IER, up->ier);
serial_out(up, UART_IER, up->ier);
-Index: linux-2.6.23.17/drivers/serial/serial_core.c
-===================================================================
---- linux-2.6.23.17.orig/drivers/serial/serial_core.c
-+++ linux-2.6.23.17/drivers/serial/serial_core.c
+--- a/drivers/serial/serial_core.c
++++ b/drivers/serial/serial_core.c
@@ -33,6 +33,7 @@
#include <linux/serial.h> /* for serial_state and serial_icounter_struct */
#include <linux/delay.h>
@@ -33,6 +33,7 @@
#include <linux/serial.h> /* for serial_state and serial_icounter_struct */
#include <linux/delay.h>
@@
-1877,10
+1837,8
@@
Index: linux-2.6.23.17/drivers/serial/serial_core.c
* Remove the devices from the tty layer
*/
tty_unregister_device(drv->tty_driver, port->line);
* Remove the devices from the tty layer
*/
tty_unregister_device(drv->tty_driver, port->line);
-Index: linux-2.6.23.17/include/linux/Kbuild
-===================================================================
---- linux-2.6.23.17.orig/include/linux/Kbuild
-+++ linux-2.6.23.17/include/linux/Kbuild
+--- a/include/linux/Kbuild
++++ b/include/linux/Kbuild
@@ -295,6 +295,7 @@ unifdef-y += pmu.h
unifdef-y += poll.h
unifdef-y += ppp_defs.h
@@ -295,6 +295,7 @@ unifdef-y += pmu.h
unifdef-y += poll.h
unifdef-y += ppp_defs.h
@@
-1889,10
+1847,8
@@
Index: linux-2.6.23.17/include/linux/Kbuild
unifdef-y += ptrace.h
unifdef-y += qnx4_fs.h
unifdef-y += quota.h
unifdef-y += ptrace.h
unifdef-y += qnx4_fs.h
unifdef-y += quota.h
-Index: linux-2.6.23.17/include/linux/parport.h
-===================================================================
---- linux-2.6.23.17.orig/include/linux/parport.h
-+++ linux-2.6.23.17/include/linux/parport.h
+--- a/include/linux/parport.h
++++ b/include/linux/parport.h
@@ -100,6 +100,7 @@ typedef enum {
#include <linux/proc_fs.h>
#include <linux/spinlock.h>
@@ -100,6 +100,7 @@ typedef enum {
#include <linux/proc_fs.h>
#include <linux/spinlock.h>
@@
-1926,10
+1882,8
@@
Index: linux-2.6.23.17/include/linux/parport.h
parport_ieee1284_interrupt (irq, port);
read_lock(&port->cad_lock);
if (port->cad && port->cad->irq_func)
parport_ieee1284_interrupt (irq, port);
read_lock(&port->cad_lock);
if (port->cad && port->cad->irq_func)
-Index: linux-2.6.23.17/include/linux/pps.h
-===================================================================
--- /dev/null
--- /dev/null
-+++
linux-2.6.23.17
/include/linux/pps.h
++++
b
/include/linux/pps.h
@@ -0,0 +1,196 @@
+/*
+ * pps.h -- PPS API kernel header.
@@ -0,0 +1,196 @@
+/*
+ * pps.h -- PPS API kernel header.
@@
-2127,10
+2081,8
@@
Index: linux-2.6.23.17/include/linux/pps.h
+#endif /* __KERNEL__ */
+
+#endif /* _PPS_H_ */
+#endif /* __KERNEL__ */
+
+#endif /* _PPS_H_ */
-Index: linux-2.6.23.17/include/linux/serial_core.h
-===================================================================
---- linux-2.6.23.17.orig/include/linux/serial_core.h
-+++ linux-2.6.23.17/include/linux/serial_core.h
+--- a/include/linux/serial_core.h
++++ b/include/linux/serial_core.h
@@ -157,6 +157,7 @@
#include <linux/tty.h>
#include <linux/mutex.h>
@@ -157,6 +157,7 @@
#include <linux/tty.h>
#include <linux/mutex.h>
This page took
0.028824 seconds
and
4
git commands to generate.