diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-02-06 10:34:32 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-02-06 10:34:32 -0800 |
| commit | 8b7b48204c70bfc07ab7def944fdc4ca8e4c39ab (patch) | |
| tree | cd422fd2529d2daee9f3a563d8049d734107759e /driver | |
| parent | 332808087a9a8a1693adcf66e4d7db730dd88796 (diff) | |
| download | patches-8b7b48204c70bfc07ab7def944fdc4ca8e4c39ab.tar.gz | |
2.6.16-rc2-git2 refresh
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/drm-classdev-cleanup.patch | 4 | ||||
| -rw-r--r-- | driver/handle-errors-returned-by-platform_get_irq.patch | 2 | ||||
| -rw-r--r-- | driver/sysfs-crash-debugging.patch | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/driver/drm-classdev-cleanup.patch b/driver/drm-classdev-cleanup.patch index 28dd5a8f4018b..0d68180b75a18 100644 --- a/driver/drm-classdev-cleanup.patch +++ b/driver/drm-classdev-cleanup.patch @@ -209,7 +209,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } --- gregkh-2.6.orig/drivers/char/drm/drmP.h +++ gregkh-2.6/drivers/char/drm/drmP.h -@@ -979,7 +979,7 @@ extern int drm_put_head(drm_head_t * hea +@@ -980,7 +980,7 @@ extern int drm_put_head(drm_head_t * hea extern unsigned int drm_debug; extern unsigned int drm_cards_limit; extern drm_head_t **drm_heads; @@ -218,7 +218,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> extern struct proc_dir_entry *drm_proc_root; /* Proc support (drm_proc.h) */ -@@ -1010,11 +1010,9 @@ extern void __drm_pci_free(drm_device_t +@@ -1011,11 +1011,9 @@ extern void __drm_pci_free(drm_device_t extern void drm_pci_free(drm_device_t * dev, drm_dma_handle_t * dmah); /* sysfs support (drm_sysfs.c) */ diff --git a/driver/handle-errors-returned-by-platform_get_irq.patch b/driver/handle-errors-returned-by-platform_get_irq.patch index 55e3f78f35cbc..01d0925499a6f 100644 --- a/driver/handle-errors-returned-by-platform_get_irq.patch +++ b/driver/handle-errors-returned-by-platform_get_irq.patch @@ -162,7 +162,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> pr_debug("%s: request_mem_region failed\n", DRV_NAME); --- gregkh-2.6.orig/drivers/mmc/pxamci.c +++ gregkh-2.6/drivers/mmc/pxamci.c -@@ -437,7 +437,7 @@ static int pxamci_probe(struct platform_ +@@ -438,7 +438,7 @@ static int pxamci_probe(struct platform_ r = platform_get_resource(pdev, IORESOURCE_MEM, 0); irq = platform_get_irq(pdev, 0); diff --git a/driver/sysfs-crash-debugging.patch b/driver/sysfs-crash-debugging.patch index 23e978571e172..41e73b7c8a453 100644 --- a/driver/sysfs-crash-debugging.patch +++ b/driver/sysfs-crash-debugging.patch @@ -65,7 +65,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> struct kobject * kobj = to_kobj(filp->f_dentry->d_parent); --- gregkh-2.6.orig/arch/i386/kernel/traps.c +++ gregkh-2.6/arch/i386/kernel/traps.c -@@ -362,7 +362,8 @@ void die(const char * str, struct pt_reg +@@ -365,7 +365,8 @@ void die(const char * str, struct pt_reg #endif if (nl) printk("\n"); @@ -100,7 +100,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #endif /* _SYSFS_H_ */ --- gregkh-2.6.orig/arch/x86_64/kernel/traps.c +++ gregkh-2.6/arch/x86_64/kernel/traps.c -@@ -414,6 +414,7 @@ void __die(const char * str, struct pt_r +@@ -414,6 +414,7 @@ void __kprobes __die(const char * str, s printk("DEBUG_PAGEALLOC"); #endif printk("\n"); |