diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-01-05 04:50:33 -0500 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-01-05 04:50:33 -0500 |
| commit | 353816f43d1fb340ff2d9a911dd5d0799c09f6a5 (patch) | |
| tree | 517290fd884d286fe2971137ac89f89e3567785a /arch/arm/mach-kirkwood/common.h | |
| parent | 160bbab3000dafccbe43688e48208cecf4deb879 (diff) | |
| parent | fe0bdec68b77020281dc814805edfe594ae89e0f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/arm/mach-pxa/corgi.c
arch/arm/mach-pxa/poodle.c
arch/arm/mach-pxa/spitz.c
Diffstat (limited to 'arch/arm/mach-kirkwood/common.h')
| -rw-r--r-- | arch/arm/mach-kirkwood/common.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h index 5774632a67e3..fe367c18e722 100644 --- a/arch/arm/mach-kirkwood/common.h +++ b/arch/arm/mach-kirkwood/common.h | |||
| @@ -30,6 +30,7 @@ void kirkwood_pcie_id(u32 *dev, u32 *rev); | |||
| 30 | 30 | ||
| 31 | void kirkwood_ehci_init(void); | 31 | void kirkwood_ehci_init(void); |
| 32 | void kirkwood_ge00_init(struct mv643xx_eth_platform_data *eth_data); | 32 | void kirkwood_ge00_init(struct mv643xx_eth_platform_data *eth_data); |
| 33 | void kirkwood_ge01_init(struct mv643xx_eth_platform_data *eth_data); | ||
| 33 | void kirkwood_ge00_switch_init(struct dsa_platform_data *d, int irq); | 34 | void kirkwood_ge00_switch_init(struct dsa_platform_data *d, int irq); |
| 34 | void kirkwood_pcie_init(void); | 35 | void kirkwood_pcie_init(void); |
| 35 | void kirkwood_rtc_init(void); | 36 | void kirkwood_rtc_init(void); |