- 3c59x-handle-pci_name-being-const.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     3c59x: handle pci_name() being const
has been removed from the -mm tree.  Its filename was
     3c59x-handle-pci_name-being-const.patch

This patch was dropped because it was merged into mainline or a subsystem tree

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: 3c59x: handle pci_name() being const
From: Greg Kroah-Hartman <gregkh@xxxxxxx>

This changes vortex_prob1() to handle pci_name() now returning a constant
string.

Cc: Steffen Klassert <klassert@xxxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 drivers/net/3c59x.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN drivers/net/3c59x.c~3c59x-handle-pci_name-being-const drivers/net/3c59x.c
--- a/drivers/net/3c59x.c~3c59x-handle-pci_name-being-const
+++ a/drivers/net/3c59x.c
@@ -1010,7 +1010,7 @@ static int __devinit vortex_probe1(struc
 	static int printed_version;
 	int retval, print_info;
 	struct vortex_chip_info * const vci = &vortex_info_tbl[chip_idx];
-	char *print_name = "3c59x";
+	const char *print_name = "3c59x";
 	struct pci_dev *pdev = NULL;
 	struct eisa_device *edev = NULL;
 	DECLARE_MAC_BUF(mac);
_

Patches currently in -mm which might be from gregkh@xxxxxxx are

origin.patch
linux-next.patch
fix-kobject-fix-kobject_rename-and-config_sysfs.patch
drivers-usb-class-cdc-acmc-fix-build-with-config_pm=n.patch
drivers-usb-class-cdc-wdmc-fix-build-with-config_pm=n.patch
usb-fix-possible-memory-leak-in-pxa27x_udc.patch
hugetlb-new-sysfs-interface.patch
checkpatch-usb_free_urb-can-take-null.patch
firmware-use-memory_read_from_buffer.patch
edac-core-fix-to-use-dynamic-kobject.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux