6 files changed, 9 insertions, 52 deletions
diff --git a/driver-core.current/device-create-char-convert-device_create_drvdata-to-device_create.patch b/driver-core.current/device-create-char-convert-device_create_drvdata-to-device_create.patch
index 94d83e73a14f97..6b8f32c9be685e 100644
--- a/driver-core.current/device-create-char-convert-device_create_drvdata-to-device_create.patch
+++ b/driver-core.current/device-create-char-convert-device_create_drvdata-to-device_create.patch
@@ -235,7 +235,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  err_unrtty:
 --- a/drivers/char/tty_io.c
 +++ b/drivers/char/tty_io.c
-@@ -3399,7 +3399,7 @@ struct device *tty_register_device(struc
+@@ -3407,7 +3407,7 @@ struct device *tty_register_device(struc
  	else
  		tty_line_name(driver, index, name);
  
@@ -244,7 +244,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  }
  
  /**
-@@ -3676,22 +3676,20 @@ static int __init tty_init(void)
+@@ -3684,22 +3684,20 @@ static int __init tty_init(void)
  	if (cdev_add(&tty_cdev, MKDEV(TTYAUX_MAJOR, 0), 1) ||
  	    register_chrdev_region(MKDEV(TTYAUX_MAJOR, 0), 1, "/dev/tty") < 0)
  		panic("Couldn't register /dev/tty driver\n");
@@ -270,7 +270,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  #endif
  
  #ifdef CONFIG_VT
-@@ -3699,7 +3697,7 @@ static int __init tty_init(void)
+@@ -3707,7 +3705,7 @@ static int __init tty_init(void)
  	if (cdev_add(&vc0_cdev, MKDEV(TTY_MAJOR, 0), 1) ||
  	    register_chrdev_region(MKDEV(TTY_MAJOR, 0), 1, "/dev/vc/0") < 0)
  		panic("Couldn't register /dev/tty0 driver\n");
@@ -325,7 +325,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  			i, viotape_unitinfo[i].rsrcname,
 --- a/drivers/char/vt.c
 +++ b/drivers/char/vt.c
-@@ -3423,10 +3423,9 @@ int register_con_driver(const struct con
+@@ -3466,10 +3466,9 @@ int register_con_driver(const struct con
  	if (retval)
  		goto err;
  
@@ -339,7 +339,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  	if (IS_ERR(con_driver->dev)) {
  		printk(KERN_WARNING "Unable to create device for %s; "
-@@ -3534,10 +3533,9 @@ static int __init vtconsole_class_init(v
+@@ -3577,10 +3576,9 @@ static int __init vtconsole_class_init(v
  		struct con_driver *con = &registered_con_driver[i];
  
  		if (con->con && !con->dev) {
@@ -355,7 +355,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  				printk(KERN_WARNING "Unable to create "
 --- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c
 +++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
-@@ -658,8 +658,7 @@ static int __devinit hwicap_setup(struct
+@@ -657,8 +657,7 @@ static int __devinit hwicap_setup(struct
  		goto failed3;
  	}
  
diff --git a/driver-core/driver-core-basic-infrastructure-for-per-module-dynamic-debug-messages.patch b/driver-core/driver-core-basic-infrastructure-for-per-module-dynamic-debug-messages.patch
index 7e6abbb91c296c..867a3ccdbd9dbc 100644
--- a/driver-core/driver-core-basic-infrastructure-for-per-module-dynamic-debug-messages.patch
+++ b/driver-core/driver-core-basic-infrastructure-for-per-module-dynamic-debug-messages.patch
@@ -746,7 +746,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +early_param("dynamic_printk", dynamic_printk_setup);
 --- a/lib/Kconfig.debug
 +++ b/lib/Kconfig.debug
-@@ -744,6 +744,61 @@ menuconfig BUILD_DOCSRC
+@@ -752,6 +752,61 @@ menuconfig BUILD_DOCSRC
  
  	  Say N if you are unsure.
  
diff --git a/lockdep-build-fix.patch b/lockdep-build-fix.patch
deleted file mode 100644
index 6af469eb163df8..00000000000000
--- a/lockdep-build-fix.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From d6672c501852d577097f6757c311d937aca0b04b Mon Sep 17 00:00:00 2001
-From: Ingo Molnar <mingo@elte.hu>
-Date: Fri, 1 Aug 2008 11:23:50 +0200
-Subject: lockdep: build fix
-
-fix:
-
- kernel/built-in.o: In function `lockdep_stats_show':
- lockdep_proc.c:(.text+0x3cb2f): undefined reference to `lockdep_count_forward_deps'
- kernel/built-in.o: In function `l_show':
- lockdep_proc.c:(.text+0x3d02b): undefined reference to `lockdep_count_forward_deps'
- lockdep_proc.c:(.text+0x3d047): undefined reference to `lockdep_count_backward_deps'
-
-Signed-off-by: Ingo Molnar <mingo@elte.hu>
----
- kernel/lockdep_internals.h |   13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
---- a/kernel/lockdep_internals.h
-+++ b/kernel/lockdep_internals.h
-@@ -50,8 +50,21 @@ extern unsigned int nr_process_chains;
- extern unsigned int max_lockdep_depth;
- extern unsigned int max_recursion_depth;
- 
-+#ifdef CONFIG_PROVE_LOCKING
- extern unsigned long lockdep_count_forward_deps(struct lock_class *);
- extern unsigned long lockdep_count_backward_deps(struct lock_class *);
-+#else
-+static inline unsigned long
-+lockdep_count_forward_deps(struct lock_class *class)
-+{
-+	return 0;
-+}
-+static inline unsigned long
-+lockdep_count_backward_deps(struct lock_class *class)
-+{
-+	return 0;
-+}
-+#endif
- 
- #ifdef CONFIG_DEBUG_LOCKDEP
- /*
diff --git a/series b/series
index eb858bda2da361..4df6a92957fcf6 100644
--- a/series
+++ b/series
@@ -134,4 +134,3 @@ usb/usb-gotemp.patch
 #ns/modpost
 
 f.patch
-lockdep-build-fix.patch
diff --git a/usb/usb-remove-info-macro-from-usb.h.patch b/usb/usb-remove-info-macro-from-usb.h.patch
index b22f836deff244..da913c19e40e63 100644
--- a/usb/usb-remove-info-macro-from-usb.h.patch
+++ b/usb/usb-remove-info-macro-from-usb.h.patch
@@ -164,7 +164,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
 --- a/drivers/input/joystick/xpad.c
 +++ b/drivers/input/joystick/xpad.c
-@@ -910,7 +910,7 @@ static int __init usb_xpad_init(void)
+@@ -911,7 +911,7 @@ static int __init usb_xpad_init(void)
  {
  	int result = usb_register(&xpad_driver);
  	if (result == 0)
diff --git a/version b/version
index ab0703565c0eb0..eeaa1b71964c42 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.6.27-rc3-git2
+2.6.27-rc3-git4