aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-pxa/tosa.c8
-rw-r--r--include/asm-arm/arch-pxa/tosa.h4
2 files changed, 4 insertions, 8 deletions
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c
index af1cce31c746..1722093cfe51 100644
--- a/arch/arm/mach-pxa/tosa.c
+++ b/arch/arm/mach-pxa/tosa.c
@@ -170,7 +170,7 @@ static struct scoop_config tosa_scoop_setup = {
170 .gpio_base = TOSA_SCOOP_GPIO_BASE, 170 .gpio_base = TOSA_SCOOP_GPIO_BASE,
171}; 171};
172 172
173struct platform_device tosascoop_device = { 173static struct platform_device tosascoop_device = {
174 .name = "sharp-scoop", 174 .name = "sharp-scoop",
175 .id = 0, 175 .id = 0,
176 .dev = { 176 .dev = {
@@ -197,7 +197,7 @@ static struct scoop_config tosa_scoop_jc_setup = {
197 .gpio_base = TOSA_SCOOP_JC_GPIO_BASE, 197 .gpio_base = TOSA_SCOOP_JC_GPIO_BASE,
198}; 198};
199 199
200struct platform_device tosascoop_jc_device = { 200static struct platform_device tosascoop_jc_device = {
201 .name = "sharp-scoop", 201 .name = "sharp-scoop",
202 .id = 1, 202 .id = 1,
203 .dev = { 203 .dev = {
@@ -421,7 +421,7 @@ static struct platform_device tosa_gpio_keys_device = {
421/* 421/*
422 * Tosa LEDs 422 * Tosa LEDs
423 */ 423 */
424struct gpio_led tosa_gpio_leds[] = { 424static struct gpio_led tosa_gpio_leds[] = {
425 { 425 {
426 .name = "tosa:amber:charge", 426 .name = "tosa:amber:charge",
427 .default_trigger = "main-battery-charging", 427 .default_trigger = "main-battery-charging",
@@ -434,7 +434,7 @@ struct gpio_led tosa_gpio_leds[] = {
434 }, 434 },
435}; 435};
436 436
437struct gpio_led_platform_data tosa_gpio_leds_platform_data = { 437static struct gpio_led_platform_data tosa_gpio_leds_platform_data = {
438 .leds = tosa_gpio_leds, 438 .leds = tosa_gpio_leds,
439 .num_leds = ARRAY_SIZE(tosa_gpio_leds), 439 .num_leds = ARRAY_SIZE(tosa_gpio_leds),
440}; 440};
diff --git a/include/asm-arm/arch-pxa/tosa.h b/include/asm-arm/arch-pxa/tosa.h
index 8bc7cdd0f79e..bb6e12137dec 100644
--- a/include/asm-arm/arch-pxa/tosa.h
+++ b/include/asm-arm/arch-pxa/tosa.h
@@ -151,12 +151,8 @@
151 151
152#define TOSA_IRQ_GPIO_MAIN_BAT_LOW IRQ_GPIO(TOSA_GPIO_MAIN_BAT_LOW) 152#define TOSA_IRQ_GPIO_MAIN_BAT_LOW IRQ_GPIO(TOSA_GPIO_MAIN_BAT_LOW)
153 153
154extern struct platform_device tosascoop_jc_device;
155extern struct platform_device tosascoop_device;
156
157#define TOSA_KEY_SYNC KEY_102ND /* ??? */ 154#define TOSA_KEY_SYNC KEY_102ND /* ??? */
158 155
159
160#ifndef CONFIG_KEYBOARD_TOSA_USE_EXT_KEYCODES 156#ifndef CONFIG_KEYBOARD_TOSA_USE_EXT_KEYCODES
161#define TOSA_KEY_RECORD KEY_YEN 157#define TOSA_KEY_RECORD KEY_YEN
162#define TOSA_KEY_ADDRESSBOOK KEY_KATAKANA 158#define TOSA_KEY_ADDRESSBOOK KEY_KATAKANA