diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-22 22:33:50 +0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-22 22:33:50 +0400 |
| commit | bcbfe664e7af019e698cef2feb85ac2b4f1ac11d (patch) | |
| tree | bade11b3088e3768612ecb2cd6e285ab67a23286 /arch/arm/mach-pxa/include | |
| parent | f6335c43f3d7816ba2e69abce4f29c41f65bb27e (diff) | |
| parent | 175854be81dc42b70591760c193113e4898b3e6f (diff) | |
| download | linux-bcbfe664e7af019e698cef2feb85ac2b4f1ac11d.tar.xz | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Diffstat (limited to 'arch/arm/mach-pxa/include')
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/corgi.h | 1 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/spitz.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/include/mach/corgi.h b/arch/arm/mach-pxa/include/mach/corgi.h index 585970ef08ce..7239281788de 100644 --- a/arch/arm/mach-pxa/include/mach/corgi.h +++ b/arch/arm/mach-pxa/include/mach/corgi.h @@ -113,6 +113,7 @@ * Shared data structures */ extern struct platform_device corgiscoop_device; +extern struct platform_device corgissp_device; #endif /* __ASM_ARCH_CORGI_H */ diff --git a/arch/arm/mach-pxa/include/mach/spitz.h b/arch/arm/mach-pxa/include/mach/spitz.h index e8488dfb7e91..fa1998caa78e 100644 --- a/arch/arm/mach-pxa/include/mach/spitz.h +++ b/arch/arm/mach-pxa/include/mach/spitz.h @@ -187,4 +187,5 @@ */ extern struct platform_device spitzscoop_device; extern struct platform_device spitzscoop2_device; +extern struct platform_device spitzssp_device; extern struct sharpsl_charger_machinfo spitz_pm_machinfo; |