diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-12-01 07:13:56 -0500 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-12-01 07:13:56 -0500 |
| commit | 307991055b0ce65d53dc1eb501c456c10eb36360 (patch) | |
| tree | 71bb9263dc71344e5d7b97ca6d5cf223f1f1a856 /drivers/pcmcia/pd6729.h | |
| parent | 1198c6d45a1ef5f4f7fdfbf33ef7d270493ec575 (diff) | |
| parent | 9b4320b77bab4031649c484da1c595f39c2e43cd (diff) | |
Merge branch 'kconfig_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-next into kbuild/rc-fixes
Diffstat (limited to 'drivers/pcmcia/pd6729.h')
| -rw-r--r-- | drivers/pcmcia/pd6729.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/pd6729.h b/drivers/pcmcia/pd6729.h index 41418d394c55..c8e84bdece38 100644 --- a/drivers/pcmcia/pd6729.h +++ b/drivers/pcmcia/pd6729.h | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | struct pd6729_socket { | 15 | struct pd6729_socket { |
| 16 | int number; | 16 | int number; |
| 17 | int card_irq; | 17 | int card_irq; |
| 18 | unsigned long io_base; /* base io address of the socket */ | 18 | unsigned long io_base; /* base io address of the socket */ |
| 19 | struct pcmcia_socket socket; | 19 | struct pcmcia_socket socket; |
| 20 | struct timer_list poll_timer; | 20 | struct timer_list poll_timer; |
| 21 | }; | 21 | }; |