diff options
author | Olof Johansson <olof@lixom.net> | 2013-06-12 19:50:10 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-06-12 19:50:10 -0400 |
commit | ff299f1b1cb4e0c44a3f76d1f8ee4eb2f64f098f (patch) | |
tree | 9e4d85cfc0c5a8394bc1fcafd7c406c5ac558c70 /drivers/parport/parport_gsc.h | |
parent | 7d428ce284fce4aacb215ca15d0274e7261864a3 (diff) | |
parent | ae7b6dccf6711e8d5815688f1572ab55bf5b3069 (diff) |
Merge tag 's3c24xx-driver-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers
From Kukjin Kim, driver updats for s3c24xx:
- move cpufreq driver into drivers/
- add pinctrl-s3c24xx driver
- cleanup OF in gpio driver
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/parport/parport_gsc.h')
-rw-r--r-- | drivers/parport/parport_gsc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/parport/parport_gsc.h b/drivers/parport/parport_gsc.h index fc9c37c54022..812214768d27 100644 --- a/drivers/parport/parport_gsc.h +++ b/drivers/parport/parport_gsc.h | |||
@@ -217,6 +217,6 @@ extern void parport_gsc_dec_use_count(void); | |||
217 | extern struct parport *parport_gsc_probe_port(unsigned long base, | 217 | extern struct parport *parport_gsc_probe_port(unsigned long base, |
218 | unsigned long base_hi, | 218 | unsigned long base_hi, |
219 | int irq, int dma, | 219 | int irq, int dma, |
220 | struct pci_dev *dev); | 220 | struct parisc_device *padev); |
221 | 221 | ||
222 | #endif /* __DRIVERS_PARPORT_PARPORT_GSC_H */ | 222 | #endif /* __DRIVERS_PARPORT_PARPORT_GSC_H */ |