+++ /dev/null
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- linux-2.6.11-rc1/init/version.c~add-oz-release-string
-+++ linux-2.6.11-rc1/init/version.c
-@@ -29,5 +29,5 @@
- EXPORT_SYMBOL(system_utsname);
-
- const char linux_banner[] =
-- "Linux version " UTS_RELEASE " (" LINUX_COMPILE_BY "@"
-+ "Linux version " UTS_RELEASE OPENZAURUS_RELEASE " (" LINUX_COMPILE_BY "@"
- LINUX_COMPILE_HOST ") (" LINUX_COMPILER ") " UTS_VERSION "\n";
---- linux-2.6.11-rc1/Makefile~add-oz-release-string
-+++ linux-2.6.11-rc1/Makefile
-@@ -827,6 +827,7 @@
- exit 1; \
- fi; \
- (echo \#define UTS_RELEASE \"$(KERNELRELEASE)\"; \
-+ echo \#define OPENZAURUS_RELEASE \"$(OPENZAURUS_RELEASE)\"; \
- echo \#define LINUX_VERSION_CODE `expr $(VERSION) \\* 65536 + $(PATCHLEVEL) \\* 256 + $(SUBLEVEL)`; \
- echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))'; \
- )
--- /dev/null
+Index: git/init/version.c
+===================================================================
+--- git.orig/init/version.c 2006-07-04 21:49:14.000000000 +0100
++++ git/init/version.c 2006-07-05 10:02:57.000000000 +0100
+@@ -30,5 +30,5 @@
+ EXPORT_SYMBOL(system_utsname);
+
+ const char linux_banner[] =
+- "Linux version " UTS_RELEASE " (" LINUX_COMPILE_BY "@"
++ "Linux version " UTS_RELEASE OPENZAURUS_RELEASE " (" LINUX_COMPILE_BY "@"
+ LINUX_COMPILE_HOST ") (" LINUX_COMPILER ") " UTS_VERSION "\n";
+Index: git/Makefile
+===================================================================
+--- git.orig/Makefile 2006-07-04 21:48:58.000000000 +0100
++++ git/Makefile 2006-07-05 10:05:03.000000000 +0100
+@@ -859,6 +859,7 @@
+ define filechk_version.h
+ (echo \#define LINUX_VERSION_CODE $(shell \
+ expr $(VERSION) \* 65536 + $(PATCHLEVEL) \* 256 + $(SUBLEVEL)); \
++ echo \#define OPENZAURUS_RELEASE \"$(OPENZAURUS_RELEASE)\"; \
+ echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))';)
+ endef
+
-Index: linux-2.6.14/drivers/serial/8250.c
+Index: git/drivers/serial/8250.c
===================================================================
---- linux-2.6.14.orig/drivers/serial/8250.c 2005-11-07 18:10:50.000000000 +0000
-+++ linux-2.6.14/drivers/serial/8250.c 2005-11-07 19:01:21.000000000 +0000
-@@ -2333,7 +2333,12 @@
- .devfs_name = "tts/",
+--- git.orig/drivers/serial/8250.c 2006-07-05 10:06:08.000000000 +0100
++++ git/drivers/serial/8250.c 2006-07-05 10:06:20.000000000 +0100
+@@ -2401,7 +2401,12 @@
+ .driver_name = "serial",
.dev_name = "ttyS",
.major = TTY_MAJOR,
+#ifdef CONFIG_SERIAL_PXA
.nr = UART_NR,
.cons = SERIAL8250_CONSOLE,
};
-Index: linux-2.6.14/drivers/serial/serial_core.c
+Index: git/drivers/serial/serial_core.c
===================================================================
---- linux-2.6.14.orig/drivers/serial/serial_core.c 2005-11-07 18:10:50.000000000 +0000
-+++ linux-2.6.14/drivers/serial/serial_core.c 2005-11-07 19:01:21.000000000 +0000
-@@ -2126,6 +2126,7 @@
+--- git.orig/drivers/serial/serial_core.c 2006-07-04 21:49:08.000000000 +0100
++++ git/drivers/serial/serial_core.c 2006-07-05 10:06:20.000000000 +0100
+@@ -2162,6 +2162,7 @@
+ normal->owner = drv->owner;
normal->driver_name = drv->driver_name;
- normal->devfs_name = drv->devfs_name;
normal->name = drv->dev_name;
+ normal->name_base = drv->name_base;
normal->major = drv->major;
normal->minor_start = drv->minor;
normal->type = TTY_DRIVER_TYPE_SERIAL;
-Index: linux-2.6.14/include/linux/serial_core.h
+Index: git/include/linux/serial_core.h
===================================================================
---- linux-2.6.14.orig/include/linux/serial_core.h 2005-11-07 18:10:56.000000000 +0000
-+++ linux-2.6.14/include/linux/serial_core.h 2005-11-07 19:01:21.000000000 +0000
-@@ -322,6 +322,7 @@
+--- git.orig/include/linux/serial_core.h 2006-07-04 21:49:14.000000000 +0100
++++ git/include/linux/serial_core.h 2006-07-05 10:07:10.000000000 +0100
+@@ -337,6 +337,7 @@
+ struct module *owner;
const char *driver_name;
const char *dev_name;
- const char *devfs_name;
+ int name_base;
int major;
int minor;
int nr;
-Index: linux-2.6.14/drivers/serial/serial_cs.c
+Index: git/drivers/serial/serial_cs.c
===================================================================
---- linux-2.6.14.orig/drivers/serial/serial_cs.c 2005-10-28 01:02:08.000000000 +0100
-+++ linux-2.6.14/drivers/serial/serial_cs.c 2005-11-07 19:01:21.000000000 +0000
-@@ -294,7 +294,7 @@
+--- git.orig/drivers/serial/serial_cs.c 2006-07-04 21:49:08.000000000 +0100
++++ git/drivers/serial/serial_cs.c 2006-07-05 10:06:20.000000000 +0100
+@@ -268,7 +268,7 @@
kio_addr_t iobase, int irq)
{
struct uart_port port;
memset(&port, 0, sizeof (struct uart_port));
port.iobase = iobase;
-@@ -311,10 +311,16 @@
+@@ -285,10 +285,16 @@
return -EINVAL;
}
include linux-openzaurus.inc
-PR = "r20"
+PR = "r2"
DEFAULT_PREFERENCE = "-1"
# Patches submitted upstream are towards top of this list
# Hacks should clearly named and at the bottom
# ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;patch=1 \
-SRC_URI = "git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;tag=553698f944ed715dfe023b4cef07601f0ce735f0 \
- ${RPSRC}/poodle_partsize-r0.patch;patch=1;status=merged \
- ${RPSRC}/jffs2_longfilename-r1.patch;patch=1;status=merged \
- ${RPSRC}/locomo_led_default_trigger-r0.patch;patch=1;status=merged \
- ${RPSRC}/zaurus_reboot-r3.patch;patch=1;status=merged \
- ${RPSRC}/poodle_mmcsd_fix-r0.patch;patch=1;status=merged \
- ${RPSRC}/poodle_ssp-r1.patch;patch=1;status=merged \
- ${RPSRC}/sharpsl_pm-do-r2.patch;patch=1;status=merged \
- ${RPSRC}/zlib_inflate-r3.patch;patch=1;status=pending \
- ${RPSRC}/logo_rotate_fix-r1.patch;patch=1;status=pending \
- ${RPSRC}/collie_frontlight-r6.patch;patch=1;status=pending \
- ${RPSRC}/input_modalias_fix-r0.patch;patch=1;status=pending \
- file://00-hostap.patch;patch=1;status=pending \
- file://10-pcnet.patch;patch=1;status=pending \
-# ${RPSRC}/alsa/asoc-v0.10-oz-r0.patch;patch=1 \
- ${RPSRC}/alsa/asoc-v0.10rc4.patch;patch=1 \
- ${RPSRC}/asoc_fixups-r1.patch;patch=1 \
+SRC_URI = "git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;tag=c6482dde1c2811afba289b2344268f850595f350 \
+ ${RPSRC}/alsa/asoc-v0.11pre2.patch;patch=1 \
+ ${RPSRC}/asoc_updates-r1.patch;patch=1 \
${RPSRC}/hx2750_base-r25.patch;patch=1 \
${RPSRC}/hx2750_bl-r7.patch;patch=1 \
${RPSRC}/hx2750_pcmcia-r2.patch;patch=1 \
${RPSRC}/hx2750_test1-r3.patch;patch=1 \
${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
${RPSRC}/input_power-r5.patch;patch=1 \
- ${RPSRC}/pxa25x_cpufreq-r0.patch;patch=1 \
+ ${RPSRC}/pxa25x_cpufreq-r1.patch;patch=1 \
${RPSRC}/sharpsl_pm_fixes1-r0.patch;patch=1 \
${RPSRC}/pm_changes-r1.patch;patch=1 \
${RPSRC}/usb_pxa27x_udc-r0.patch;patch=1 \
- ${RPSRC}/usb_add_epalloc-r1.patch;patch=1 \
+ ${RPSRC}/usb_add_epalloc-r2.patch;patch=1 \
${DOSRC}/kexec-arm-r2.patch;patch=1 \
${RPSRC}/locomo_kbd_tweak-r0.patch;patch=1 \
${RPSRC}/poodle_pm-r1.patch;patch=1 \
- ${RPSRC}/pxafb_changeres-r0.patch;patch=1 \
+ ${RPSRC}/pxafb_changeres-r1.patch;patch=1 \
file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
file://hrw-pcmcia-ids-r2.patch;patch=1 \
${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \
S = "${WORKDIR}/git"
# to get module dependencies working
-KERNEL_RELEASE = "2.6.17-rc3"
+KERNEL_RELEASE = "2.6.17"
git.openpandora.org / openembedded.git / commitdiff