diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-07 10:42:24 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-07 10:42:24 -0700 |
| commit | 6d127f8eab4ef3261d10695118218966dd4bd8f8 (patch) | |
| tree | ed2985044169720c2a2ce89f555b2d70642483a1 | |
| parent | a02adaa60988e498f5f838893b5aa23f24f2f3c3 (diff) | |
| download | patches-6d127f8eab4ef3261d10695118218966dd4bd8f8.tar.gz | |
2.6.27-rc9 resync
7 files changed, 18 insertions, 18 deletions
diff --git a/driver-core/device-create-video-convert-device_create_drvdata-to-device_create.patch b/driver-core/device-create-video-convert-device_create_drvdata-to-device_create.patch index da8030353c1d25..0f387fcbfc67f1 100644 --- a/driver-core/device-create-video-convert-device_create_drvdata-to-device_create.patch +++ b/driver-core/device-create-video-convert-device_create_drvdata-to-device_create.patch @@ -19,7 +19,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c -@@ -3588,8 +3588,8 @@ static int __init fb_console_init(void) +@@ -3592,8 +3592,8 @@ static int __init fb_console_init(void) acquire_console_sem(); fb_register_client(&fbcon_event_notifier); diff --git a/driver-core/warn-when-statically-allocated-kobjects-are-used.patch b/driver-core/warn-when-statically-allocated-kobjects-are-used.patch index b216217c8ce2bd..e085d42cd8e089 100644 --- a/driver-core/warn-when-statically-allocated-kobjects-are-used.patch +++ b/driver-core/warn-when-statically-allocated-kobjects-are-used.patch @@ -47,7 +47,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> void setup_arch(char **); --- a/init/main.c +++ b/init/main.c -@@ -790,12 +790,21 @@ static void run_init_process(char *init_ +@@ -789,12 +789,21 @@ static void run_init_process(char *init_ kernel_execve(init_filename, argv_init, envp_init); } diff --git a/staging/staging-add-maintainers-entry.patch b/staging/staging-add-maintainers-entry.patch index f76d0da9dc4890..8612207a13e212 100644 --- a/staging/staging-add-maintainers-entry.patch +++ b/staging/staging-add-maintainers-entry.patch @@ -14,7 +14,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -3863,6 +3863,13 @@ M: chrisw@sous-sol.org +@@ -3862,6 +3862,13 @@ M: chrisw@sous-sol.org L: stable@kernel.org S: Maintained diff --git a/staging/staging-add-taint_crap-flag-to-drivers-staging-modules.patch b/staging/staging-add-taint_crap-flag-to-drivers-staging-modules.patch index 8d689d7859e639..fb3801f393de8b 100644 --- a/staging/staging-add-taint_crap-flag-to-drivers-staging-modules.patch +++ b/staging/staging-add-taint_crap-flag-to-drivers-staging-modules.patch @@ -41,7 +41,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /** * Record CRCs for unresolved symbols **/ -@@ -2133,6 +2141,7 @@ int main(int argc, char **argv) +@@ -2135,6 +2143,7 @@ int main(int argc, char **argv) buf.pos = 0; add_header(&buf, mod); diff --git a/usb/usb-remove-info-macro-from-usb.h.patch b/usb/usb-remove-info-macro-from-usb.h.patch index e64c29ff439ee9..70c90eb82fd49e 100644 --- a/usb/usb-remove-info-macro-from-usb.h.patch +++ b/usb/usb-remove-info-macro-from-usb.h.patch @@ -455,7 +455,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> ov511_set_packet_size(ov, packetsize); } } -@@ -4122,7 +4127,7 @@ ov51x_v4l1_ioctl_internal(struct inode * +@@ -4124,7 +4129,7 @@ ov51x_v4l1_ioctl_internal(struct inode * return -EIO; if (force_palette && p->palette != force_palette) { @@ -464,7 +464,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> symbolic(v4l1_plist, p->palette)); return -EINVAL; } -@@ -4850,26 +4855,27 @@ ov7xx0_configure(struct usb_ov511 *ov) +@@ -4852,26 +4857,27 @@ ov7xx0_configure(struct usb_ov511 *ov) err("Error detecting sensor type"); return -1; } else if ((rc & 3) == 3) { @@ -497,7 +497,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> ov->sensor = SEN_OV7620; } else { err("Unknown image sensor version: %d", rc & 3); -@@ -5025,16 +5031,16 @@ ov6xx0_configure(struct usb_ov511 *ov) +@@ -5027,16 +5033,16 @@ ov6xx0_configure(struct usb_ov511 *ov) if ((rc & 3) == 0) { ov->sensor = SEN_OV6630; @@ -518,7 +518,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } /* Set sensor-specific vars */ -@@ -5089,10 +5095,10 @@ ks0127_configure(struct usb_ov511 *ov) +@@ -5091,10 +5097,10 @@ ks0127_configure(struct usb_ov511 *ov) err("Error detecting sensor type"); return -1; } else if ((rc & 0x0f) == 0) { @@ -531,7 +531,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> ov->sensor = SEN_KS0127B; } } else { -@@ -5201,7 +5207,8 @@ saa7111a_configure(struct usb_ov511 *ov) +@@ -5203,7 +5209,8 @@ saa7111a_configure(struct usb_ov511 *ov) err("Error detecting sensor version"); return -1; } else { @@ -541,7 +541,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> ov->sensor = SEN_SAA7111A; } -@@ -5264,7 +5271,7 @@ ov511_configure(struct usb_ov511 *ov) +@@ -5266,7 +5273,7 @@ ov511_configure(struct usb_ov511 *ov) PDEBUG (1, "CustomID = %d", ov->customid); ov->desc = symbolic(camlist, ov->customid); @@ -550,7 +550,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (0 == strcmp(ov->desc, NOT_DEFINED_STR)) { err("Camera type (%d) not recognized", ov->customid); -@@ -5428,7 +5435,8 @@ ov518_configure(struct usb_ov511 *ov) +@@ -5430,7 +5437,8 @@ ov518_configure(struct usb_ov511 *ov) PDEBUG(4, ""); /* First 5 bits of custom ID reg are a revision ID on OV518 */ @@ -560,7 +560,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* Give it the default description */ ov->desc = symbolic(camlist, 0); -@@ -5776,7 +5784,8 @@ ov51x_probe(struct usb_interface *intf, +@@ -5778,7 +5786,8 @@ ov51x_probe(struct usb_interface *intf, goto error; } @@ -570,7 +570,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> init_waitqueue_head(&ov->wq); -@@ -5857,8 +5866,8 @@ ov51x_probe(struct usb_interface *intf, +@@ -5859,8 +5868,8 @@ ov51x_probe(struct usb_interface *intf, goto error; } @@ -581,7 +581,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> usb_set_intfdata(intf, ov); if (ov_create_sysfs(ov->vdev)) { -@@ -5961,7 +5970,8 @@ usb_ov511_init(void) +@@ -5963,7 +5972,8 @@ usb_ov511_init(void) if (retval) goto out; @@ -591,7 +591,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> out: return retval; -@@ -5971,8 +5981,7 @@ static void __exit +@@ -5973,8 +5983,7 @@ static void __exit usb_ov511_exit(void) { usb_deregister(&ov511_driver); diff --git a/usb/usb-remove-warn-macro-from-usb.h.patch b/usb/usb-remove-warn-macro-from-usb.h.patch index e9f0a85134e04b..15c917dce4c16b 100644 --- a/usb/usb-remove-warn-macro-from-usb.h.patch +++ b/usb/usb-remove-warn-macro-from-usb.h.patch @@ -578,7 +578,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } return status; -@@ -5208,7 +5211,8 @@ saa7111a_configure(struct usb_ov511 *ov) +@@ -5210,7 +5213,8 @@ saa7111a_configure(struct usb_ov511 *ov) if (ov->bclass == BCL_OV511) reg_w(ov, 0x11, 0x00); else @@ -588,7 +588,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return 0; } -@@ -5446,7 +5450,8 @@ ov518_configure(struct usb_ov511 *ov) +@@ -5448,7 +5452,8 @@ ov518_configure(struct usb_ov511 *ov) * required. OV518 has no uncompressed mode, to save RAM. */ if (!dumppix && !ov->compress) { ov->compress = 1; @@ -1 +1 @@ -2.6.27-rc8 +2.6.27-rc9 |