diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 11:12:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 11:12:21 -0400 |
| commit | fdc76bf9b62446c9d4b00e0d355c3212b4f1b13b (patch) | |
| tree | d4266abf69b2ef462b147a33d4f905055781714b /drivers | |
| parent | 72441bdc76f7f71d7b75cdaa48f26dbb1f3d932e (diff) | |
| parent | f6335c43f3d7816ba2e69abce4f29c41f65bb27e (diff) | |
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] clps711x: add sparsemem definitions
[ARM] 5315/1: Fix section mismatch warning (sa1111)
[ARM] Orion: activate workaround for 88f6183 SPI clock erratum
[ARM] Orion: instantiate the dsa switch driver
[ARM] mv78xx0: force link speed/duplex on eth2/eth3
[ARM] remove extra brace in arch/arm/mach-pxa/trizeps4.c
[ARM] balance parenthesis in header file
[ARM] pxa: fix trizeps PCMCIA build
[ARM] pxa: fix trizeps defconfig
[ARM] dmabounce requires ZONE_DMA
[ARM] 5303/1: period_cycles should be greater than 1
[ARM] 5310/1: Fix cache flush functions for ARMv4
[ARM] pxa: fix 3bca103a1e658d23737d20e1989139d9ca8973bf
[ARM] pxa: fix redefinition of NR_IRQS
[ARM] S3C24XX: Fix redefine of DEFINE_TIMER() in s3c24xx pwm-clock.c
[ARM] S3C2443: Fix HCLK rate
[ARM] S3C24XX: Serial driver debug depends on DEBUG_LL
[ARM] S3C24XX: pwm-clock set_parent mask fix
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pcmcia/Makefile | 2 | ||||
| -rw-r--r-- | drivers/serial/Kconfig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile index b46c60b72708..23e492bf75cf 100644 --- a/drivers/pcmcia/Makefile +++ b/drivers/pcmcia/Makefile | |||
| @@ -70,7 +70,7 @@ pxa2xx-obj-$(CONFIG_MACH_MAINSTONE) += pxa2xx_mainstone.o | |||
| 70 | pxa2xx-obj-$(CONFIG_PXA_SHARPSL) += pxa2xx_sharpsl.o | 70 | pxa2xx-obj-$(CONFIG_PXA_SHARPSL) += pxa2xx_sharpsl.o |
| 71 | pxa2xx-obj-$(CONFIG_MACH_ARMCORE) += pxa2xx_cm_x2xx_cs.o | 71 | pxa2xx-obj-$(CONFIG_MACH_ARMCORE) += pxa2xx_cm_x2xx_cs.o |
| 72 | pxa2xx-obj-$(CONFIG_ARCH_VIPER) += pxa2xx_viper.o | 72 | pxa2xx-obj-$(CONFIG_ARCH_VIPER) += pxa2xx_viper.o |
| 73 | pxa2xx-obj-$(CONFIG_TRIZEPS_PCMCIA) += pxa2xx_trizeps.o | 73 | pxa2xx-obj-$(CONFIG_TRIZEPS_PCMCIA) += pxa2xx_trizeps4.o |
| 74 | pxa2xx-obj-$(CONFIG_MACH_PALMTX) += pxa2xx_palmtx.o | 74 | pxa2xx-obj-$(CONFIG_MACH_PALMTX) += pxa2xx_palmtx.o |
| 75 | pxa2xx-obj-$(CONFIG_MACH_PALMLD) += pxa2xx_palmld.o | 75 | pxa2xx-obj-$(CONFIG_MACH_PALMLD) += pxa2xx_palmld.o |
| 76 | 76 | ||
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index db783b77a881..c94d3c4b7521 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig | |||
| @@ -457,7 +457,7 @@ config SERIAL_SAMSUNG | |||
| 457 | 457 | ||
| 458 | config SERIAL_SAMSUNG_DEBUG | 458 | config SERIAL_SAMSUNG_DEBUG |
| 459 | bool "Samsung SoC serial debug" | 459 | bool "Samsung SoC serial debug" |
| 460 | depends on SERIAL_SAMSUNG | 460 | depends on SERIAL_SAMSUNG && DEBUG_LL |
| 461 | help | 461 | help |
| 462 | Add support for debugging the serial driver. Since this is | 462 | Add support for debugging the serial driver. Since this is |
| 463 | generally being used as a console, we use our own output | 463 | generally being used as a console, we use our own output |