diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2005-11-08 08:57:03 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-11-08 08:57:03 -0800 |
| commit | 80fb9e17078057ed823e3938d4a8518bb4c71a0e (patch) | |
| tree | da8c2858833245e2338f1509a3043046275791a6 /driver | |
| parent | 033190f87bc93cc1b702cbea760f7409525ece1f (diff) | |
| download | patches-80fb9e17078057ed823e3938d4a8518bb4c71a0e.tar.gz | |
2.6.14-git11 refresh
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/driver-sample.sh.patch | 6 | ||||
| -rw-r--r-- | driver/speakup-core.patch | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/driver/driver-sample.sh.patch b/driver/driver-sample.sh.patch index 7e9b2e94334ca..861404f75bbd2 100644 --- a/driver/driver-sample.sh.patch +++ b/driver/driver-sample.sh.patch @@ -14,14 +14,14 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- + block/genhd.c | 13 +++++++++++++ drivers/base/class.c | 22 ++++++++++++++++++++++ - drivers/block/genhd.c | 13 +++++++++++++ fs/partitions/check.c | 14 ++++++++++++++ include/linux/device.h | 1 + 4 files changed, 50 insertions(+) ---- gregkh-2.6.orig/drivers/block/genhd.c -+++ gregkh-2.6/drivers/block/genhd.c +--- gregkh-2.6.orig/block/genhd.c ++++ gregkh-2.6/block/genhd.c @@ -401,6 +401,14 @@ static ssize_t disk_stats_read(struct ge jiffies_to_msecs(disk_stat_read(disk, io_ticks)), jiffies_to_msecs(disk_stat_read(disk, time_in_queue))); diff --git a/driver/speakup-core.patch b/driver/speakup-core.patch index d0c7f4508a2e7..b7260cd767642 100644 --- a/driver/speakup-core.patch +++ b/driver/speakup-core.patch @@ -8810,7 +8810,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/char/consolemap.c +++ gregkh-2.6/drivers/char/consolemap.c -@@ -670,3 +670,4 @@ console_map_init(void) +@@ -668,3 +668,4 @@ console_map_init(void) } EXPORT_SYMBOL(con_copy_unimap); @@ -9070,7 +9070,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> # Makefile for the Linux kernel device drivers. # # 15 Sep 2000, Christoph Hellwig <hch@infradead.org> -@@ -27,6 +26,8 @@ obj-$(CONFIG_FB_INTEL) += video +@@ -28,6 +27,8 @@ obj-$(CONFIG_FB_INTEL) += video # serial drivers start registering their serio ports obj-$(CONFIG_SERIO) += input/serio/ obj-y += serial/ @@ -9079,7 +9079,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> obj-$(CONFIG_PARPORT) += parport/ obj-y += base/ block/ misc/ mfd/ net/ media/ obj-$(CONFIG_NUBUS) += nubus/ -@@ -50,7 +51,6 @@ obj-$(CONFIG_TC) += tc/ +@@ -51,7 +52,6 @@ obj-$(CONFIG_TC) += tc/ obj-$(CONFIG_USB) += usb/ obj-$(CONFIG_USB_GADGET) += usb/gadget/ obj-$(CONFIG_GAMEPORT) += input/gameport/ @@ -9107,7 +9107,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #endif --- gregkh-2.6.orig/MAINTAINERS +++ gregkh-2.6/MAINTAINERS -@@ -2348,6 +2348,13 @@ M: wli@holomorphy.com +@@ -2374,6 +2374,13 @@ M: wli@holomorphy.com L: sparclinux@vger.kernel.org S: Maintained |