Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0950efd1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pcmcia-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pcmcia-2.6:
  pcmcia: document return value of pcmcia_loop_config
  pcmcia: dtl1_cs: fix pcmcia_loop_config logic
  pcmcia: drop non-existant includes
  pcmcia: disable prefetch/burst for OZ6933
  pcmcia: fix incorrect argument order to list_add_tail()
  pcmcia: drivers/pcmcia/pcmcia_resource.c: Remove unnecessary semicolons
  pcmcia: Use phys_addr_t for physical addresses
  pcmcia: drivers/pcmcia: Make static
parents 4406c56d 889c2774

drivers/bluetooth/dtl1_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -618,7 +618,7 @@ static int dtl1_config(struct pcmcia_device *link) 


	/* Look for a generic full-sized window */

	link->io.NumPorts1 = 8;

	if (!pcmcia_loop_config(link, dtl1_confcheck, NULL))

	if (pcmcia_loop_config(link, dtl1_confcheck, NULL) < 0)

		goto failed;



	i = pcmcia_request_irq(link, &link->irq);

drivers/pcmcia/au1000_pb1x00.c

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <linux/delay.h>

#include <linux/ioport.h>

#include <linux/kernel.h>

#include <linux/tqueue.h>

#include <linux/timer.h>

#include <linux/mm.h>

#include <linux/proc_fs.h>

drivers/pcmcia/au1000_xxs1500.c

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
#include <linux/delay.h>

#include <linux/ioport.h>

#include <linux/kernel.h>

#include <linux/tqueue.h>

#include <linux/timer.h>

#include <linux/mm.h>

#include <linux/proc_fs.h>

drivers/pcmcia/ds.c

+1 −2
Original line number Diff line number Diff line
@@ -236,7 +236,6 @@ pcmcia_store_new_id(struct device_driver *driver, const char *buf, size_t count) 
	if (!dynid)

		return -ENOMEM;



	INIT_LIST_HEAD(&dynid->node);

	dynid->id.match_flags = match_flags;

	dynid->id.manf_id = manf_id;

	dynid->id.card_id = card_id;
@@ -246,7 +245,7 @@ pcmcia_store_new_id(struct device_driver *driver, const char *buf, size_t count) 
	memcpy(dynid->id.prod_id_hash, prod_id_hash, sizeof(__u32) * 4);



	spin_lock(&pdrv->dynids.lock);

	list_add_tail(&pdrv->dynids.list, &dynid->node);

	list_add_tail(&dynid->node, &pdrv->dynids.list);

	spin_unlock(&pdrv->dynids.lock);



	if (get_driver(&pdrv->drv)) {

drivers/pcmcia/o2micro.h

+4 −0
Original line number Diff line number Diff line
@@ -48,6 +48,9 @@ 
#ifndef PCI_DEVICE_ID_O2_6812

#define PCI_DEVICE_ID_O2_6812		0x6872

#endif

#ifndef PCI_DEVICE_ID_O2_6933

#define PCI_DEVICE_ID_O2_6933           0x6933

#endif



/* Additional PCI configuration registers */
@@ -154,6 +157,7 @@ static int o2micro_override(struct yenta_socket *socket) 
		case PCI_DEVICE_ID_O2_6812:

		case PCI_DEVICE_ID_O2_6832:

		case PCI_DEVICE_ID_O2_6836:

 		case PCI_DEVICE_ID_O2_6933:

			dev_printk(KERN_INFO, &socket->dev->dev,

				   "Yenta O2: old bridge, disabling read "

				   "prefetch/write burst\n");