diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:11:56 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:11:56 -0400 |
| commit | 71d530cd1b6d97094481002a04c77fea1c8e1c22 (patch) | |
| tree | e786da7145d83c19a594adf76ed90d52c51058b1 /drivers/pcmcia | |
| parent | d7a80dad2fe19a2b8c119c8e9cba605474a75a2b (diff) | |
| parent | d588fcbe5a7ba8bba2cebf7799ab2d573717a806 (diff) | |
Merge branch 'master' into upstream
Conflicts:
drivers/scsi/libata-core.c
drivers/scsi/libata-scsi.c
include/linux/pci_ids.h
Diffstat (limited to 'drivers/pcmcia')
| -rw-r--r-- | drivers/pcmcia/sa1100_badge4.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pcmcia/sa1100_badge4.c b/drivers/pcmcia/sa1100_badge4.c index c6b262b653d3..19b1e1276220 100644 --- a/drivers/pcmcia/sa1100_badge4.c +++ b/drivers/pcmcia/sa1100_badge4.c | |||
| @@ -128,8 +128,8 @@ badge4_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_state | |||
| 128 | 128 | ||
| 129 | static struct pcmcia_low_level badge4_pcmcia_ops = { | 129 | static struct pcmcia_low_level badge4_pcmcia_ops = { |
| 130 | .owner = THIS_MODULE, | 130 | .owner = THIS_MODULE, |
| 131 | .init = sa1111_pcmcia_hw_init, | 131 | .hw_init = sa1111_pcmcia_hw_init, |
| 132 | .shutdown = sa1111_pcmcia_hw_shutdown, | 132 | .hw_shutdown = sa1111_pcmcia_hw_shutdown, |
| 133 | .socket_state = sa1111_pcmcia_socket_state, | 133 | .socket_state = sa1111_pcmcia_socket_state, |
| 134 | .configure_socket = badge4_pcmcia_configure_socket, | 134 | .configure_socket = badge4_pcmcia_configure_socket, |
| 135 | 135 | ||