aboutsummaryrefslogtreecommitdiffstats
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2008-05-14 07:56:46 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2008-05-14 07:56:46 -0700
commit09ea741e37296144a562156324117133d668759c (patch)
treed894674486d4d8f12e846326658e386d976a2a3a
parentbab9c64adea0ecc084fa4f65a760f9cb95535d5f (diff)
downloadpatches-09ea741e37296144a562156324117133d668759c.tar.gz
2.6.26-rc2-git3
-rw-r--r--ldp/framebuffer-add-the-via-framebuffer-driver.patch2
-rw-r--r--usb/bitmap-add-bitmap_copy_le.patch4
-rw-r--r--version2
3 files changed, 4 insertions, 4 deletions
diff --git a/ldp/framebuffer-add-the-via-framebuffer-driver.patch b/ldp/framebuffer-add-the-via-framebuffer-driver.patch
index ae9c6a17ea4516..c154d0ec01820c 100644
--- a/ldp/framebuffer-add-the-via-framebuffer-driver.patch
+++ b/ldp/framebuffer-add-the-via-framebuffer-driver.patch
@@ -55,7 +55,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
-@@ -1953,6 +1953,12 @@ config FB_AM200EPD
+@@ -1952,6 +1952,12 @@ config FB_AM200EPD
This enables support for the Metronome display controller used on
the E-Ink AM-200 EPD devkit.
diff --git a/usb/bitmap-add-bitmap_copy_le.patch b/usb/bitmap-add-bitmap_copy_le.patch
index 77808d1c3fe0e7..0e82e5bd3f1589 100644
--- a/usb/bitmap-add-bitmap_copy_le.patch
+++ b/usb/bitmap-add-bitmap_copy_le.patch
@@ -21,7 +21,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/include/linux/bitmap.h
+++ b/include/linux/bitmap.h
-@@ -130,6 +130,7 @@ extern void bitmap_fold(unsigned long *d
+@@ -129,6 +129,7 @@ extern void bitmap_fold(unsigned long *d
extern int bitmap_find_free_region(unsigned long *bitmap, int bits, int order);
extern void bitmap_release_region(unsigned long *bitmap, int pos, int order);
extern int bitmap_allocate_region(unsigned long *bitmap, int pos, int order);
@@ -31,7 +31,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
( \
--- a/lib/bitmap.c
+++ b/lib/bitmap.c
-@@ -1012,3 +1012,23 @@ int bitmap_allocate_region(unsigned long
+@@ -996,3 +996,23 @@ int bitmap_allocate_region(unsigned long
return 0;
}
EXPORT_SYMBOL(bitmap_allocate_region);
diff --git a/version b/version
index 7096dde18b5d0d..5267725b51acfd 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.6.26-rc2-git2
+2.6.26-rc2-git3