diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-01-25 15:03:22 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-01-25 15:03:22 -0500 |
| commit | 3092ad9622508428a20f1cd45ad3ac9f8fbf7cd4 (patch) | |
| tree | b3b5f3530ac7b487284bfd3da4d4e74cc604a042 | |
| parent | c55805c7a83b0944fc5d216e21f42a2f55ec9dda (diff) | |
| download | rt-patches-v2.6.33-rt.tar.gz | |
reparent comedi typo fix into original mutex patchv2.6.33.7.2-rt30v2.6.33-rt
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | mutex-semaphore-cleanups-in-staging-dir.patch | 2 | ||||
| -rw-r--r-- | series | 1 | ||||
| -rw-r--r-- | staging-comedi-Fix-type-in-semaphore-conversion.patch | 29 |
3 files changed, 1 insertions, 31 deletions
diff --git a/mutex-semaphore-cleanups-in-staging-dir.patch b/mutex-semaphore-cleanups-in-staging-dir.patch index d3ba0e5..877d9ab 100644 --- a/mutex-semaphore-cleanups-in-staging-dir.patch +++ b/mutex-semaphore-cleanups-in-staging-dir.patch @@ -69,7 +69,7 @@ index 9a1b559..d611bd7 100644 "usbduxsub[%d] is ready to connect to comedi.\n", index); - init_MUTEX(&(usbduxsub[index].sem)); -+ sema_init(&(usbduxsub[index].sem)), 1; ++ sema_init(&(usbduxsub[index].sem), 1); /* save a pointer to the usb device */ usbduxsub[index].usbdev = udev; @@ -561,7 +561,6 @@ ssb-Handle-alternate-SSPROM-location.patch # v2.6.33.7.1-rt29.patch perf-Use-kmap_atomic_direct.patch perf-Provide-kmap_atomic_direct-for-CONFIG_HIGHMEM.patch -staging-comedi-Fix-type-in-semaphore-conversion.patch # also known as v2.6.35-6122-g0a377cf NFS-Fix-an-Oops-in-the-NFSv4-atomic-open-code.patch # also known as v2.6.35-3152-g5b75c49 diff --git a/staging-comedi-Fix-type-in-semaphore-conversion.patch b/staging-comedi-Fix-type-in-semaphore-conversion.patch deleted file mode 100644 index d237794..0000000 --- a/staging-comedi-Fix-type-in-semaphore-conversion.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 00b073df968c8ced3df1e43d4d04ae52af5ff999 Mon Sep 17 00:00:00 2001 -From: adi@drcomp.erfurt.thur.de <adi@drcomp.erfurt.thur.de> -Date: Thu, 16 Sep 2010 17:28:40 +0200 -Subject: [PATCH] staging/comedi: Fix type in semaphore conversion - -commit 00b073df968c8ced3df1e43d4d04ae52af5ff999 in tip. - -This patch corrects a typo in the RT patchset that prevents usbdux.c -from being built. - -Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de> -Signed-off-by: Thomas Gleixner <tglx@linutronix.de> - -diff --git a/drivers/staging/comedi/drivers/usbdux.c b/drivers/staging/comedi/drivers/usbdux.c -index d611bd7..b98e91c 100644 ---- a/drivers/staging/comedi/drivers/usbdux.c -+++ b/drivers/staging/comedi/drivers/usbdux.c -@@ -2370,7 +2370,7 @@ static int usbduxsub_probe(struct usb_interface *uinterf, - dev_dbg(dev, "comedi_: usbdux: " - "usbduxsub[%d] is ready to connect to comedi.\n", index); - -- sema_init(&(usbduxsub[index].sem)), 1; -+ sema_init(&(usbduxsub[index].sem), 1); - /* save a pointer to the usb device */ - usbduxsub[index].usbdev = udev; - --- -1.7.1.1 - |