diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-01 09:12:56 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-01 09:12:56 -0400 |
| commit | b262e60309e1b0eb25d300c7e739427d5316abb1 (patch) | |
| tree | bf319d78c79bb5cb617ff0c8340c73aa349bba15 /arch/arm/mach-pxa | |
| parent | 93c8b90f01f0dc73891da4e84b26524b61d29d66 (diff) | |
| parent | 0523820482dcb42784572ffd2296c2f08c275a2b (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath9k/core.c
drivers/net/wireless/ath9k/main.c
net/core/dev.c
Diffstat (limited to 'arch/arm/mach-pxa')
| -rw-r--r-- | arch/arm/mach-pxa/time.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/tosa.c | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/time.c b/arch/arm/mach-pxa/time.c index 67e18509d7bf..b0d6b32654cf 100644 --- a/arch/arm/mach-pxa/time.c +++ b/arch/arm/mach-pxa/time.c | |||
| @@ -17,9 +17,9 @@ | |||
| 17 | #include <linux/interrupt.h> | 17 | #include <linux/interrupt.h> |
| 18 | #include <linux/clockchips.h> | 18 | #include <linux/clockchips.h> |
| 19 | #include <linux/sched.h> | 19 | #include <linux/sched.h> |
| 20 | #include <linux/cnt32_to_63.h> | ||
| 20 | 21 | ||
| 21 | #include <asm/div64.h> | 22 | #include <asm/div64.h> |
| 22 | #include <asm/cnt32_to_63.h> | ||
| 23 | #include <asm/mach/irq.h> | 23 | #include <asm/mach/irq.h> |
| 24 | #include <asm/mach/time.h> | 24 | #include <asm/mach/time.h> |
| 25 | #include <mach/pxa-regs.h> | 25 | #include <mach/pxa-regs.h> |
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c index 5dab30eafddc..9f3ef9eb32e3 100644 --- a/arch/arm/mach-pxa/tosa.c +++ b/arch/arm/mach-pxa/tosa.c | |||
| @@ -50,6 +50,7 @@ | |||
| 50 | #include <asm/mach/sharpsl_param.h> | 50 | #include <asm/mach/sharpsl_param.h> |
| 51 | 51 | ||
| 52 | #include "generic.h" | 52 | #include "generic.h" |
| 53 | #include "clock.h" | ||
| 53 | #include "devices.h" | 54 | #include "devices.h" |
| 54 | 55 | ||
| 55 | static unsigned long tosa_pin_config[] = { | 56 | static unsigned long tosa_pin_config[] = { |
| @@ -521,6 +522,14 @@ static struct gpio_keys_button tosa_gpio_keys[] = { | |||
| 521 | .wakeup = 1, | 522 | .wakeup = 1, |
| 522 | .active_low = 1, | 523 | .active_low = 1, |
| 523 | }, | 524 | }, |
| 525 | { | ||
| 526 | .type = EV_SW, | ||
| 527 | .code = SW_HEADPHONE_INSERT, | ||
| 528 | .gpio = TOSA_GPIO_EAR_IN, | ||
| 529 | .desc = "HeadPhone insert", | ||
| 530 | .active_low = 1, | ||
| 531 | .debounce_interval = 300, | ||
| 532 | }, | ||
| 524 | }; | 533 | }; |
| 525 | 534 | ||
| 526 | static struct gpio_keys_platform_data tosa_gpio_keys_platform_data = { | 535 | static struct gpio_keys_platform_data tosa_gpio_keys_platform_data = { |
| @@ -792,6 +801,8 @@ static void __init tosa_init(void) | |||
| 792 | pxa_set_i2c_info(NULL); | 801 | pxa_set_i2c_info(NULL); |
| 793 | platform_scoop_config = &tosa_pcmcia_config; | 802 | platform_scoop_config = &tosa_pcmcia_config; |
| 794 | 803 | ||
| 804 | clk_add_alias("CLK_CK3P6MI", &tc6393xb_device.dev, "GPIO11_CLK", NULL); | ||
| 805 | |||
| 795 | platform_add_devices(devices, ARRAY_SIZE(devices)); | 806 | platform_add_devices(devices, ARRAY_SIZE(devices)); |
| 796 | } | 807 | } |
| 797 | 808 | ||