diff options
Diffstat (limited to 'packages/linux/linux-rp-2.6.24')
| -rw-r--r-- | packages/linux/linux-rp-2.6.24/defconfig-collie | 10 | ||||
| -rw-r--r-- | packages/linux/linux-rp-2.6.24/sharpsl-rc-r2.patch | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/packages/linux/linux-rp-2.6.24/defconfig-collie b/packages/linux/linux-rp-2.6.24/defconfig-collie index a29a12de45..b4b1e114d9 100644 --- a/packages/linux/linux-rp-2.6.24/defconfig-collie +++ b/packages/linux/linux-rp-2.6.24/defconfig-collie @@ -825,7 +825,7 @@ CONFIG_SPI_MASTER=y # SPI Master Controller Drivers # # CONFIG_SPI_BITBANG is not set -# CONFIG_SPI_LOCOMO is not set +CONFIG_SPI_LOCOMO=m # # SPI Protocol Masters @@ -857,8 +857,8 @@ CONFIG_SSB_POSSIBLE=y CONFIG_MCP=y CONFIG_MCP_SA11X0=y CONFIG_MCP_UCB1200=y -CONFIG_MCP_UCB1200_TS=m -# CONFIG_MCP_COLLIE_TS is not set +# CONFIG_MCP_UCB1200_TS is not set +CONFIG_MCP_COLLIE_TS=m # # Multimedia devices @@ -1014,8 +1014,8 @@ CONFIG_HID=m # CONFIG_HIDRAW is not set # CONFIG_USB_SUPPORT is not set CONFIG_MMC=m -CONFIG_MMC_DEBUG=y -CONFIG_MMC_UNSAFE_RESUME=y +# CONFIG_MMC_DEBUG is not set +# CONFIG_MMC_UNSAFE_RESUME is not set # # MMC/SD Card Drivers diff --git a/packages/linux/linux-rp-2.6.24/sharpsl-rc-r2.patch b/packages/linux/linux-rp-2.6.24/sharpsl-rc-r2.patch index 3927ffeccf..6fb34ec179 100644 --- a/packages/linux/linux-rp-2.6.24/sharpsl-rc-r2.patch +++ b/packages/linux/linux-rp-2.6.24/sharpsl-rc-r2.patch @@ -6,8 +6,8 @@ This patch is a bit ugly: Index: linux-2.6.24/drivers/input/keyboard/sharpsl_rc.c =================================================================== ---- linux-2.6.24.orig/drivers/input/keyboard/sharpsl_rc.c 2008-03-07 20:47:28.000000000 +0000 -+++ linux-2.6.24/drivers/input/keyboard/sharpsl_rc.c 2008-03-07 22:36:40.000000000 +0000 +--- linux-2.6.24.orig/drivers/input/keyboard/sharpsl_rc.c 2008-03-08 19:29:02.000000000 +0000 ++++ linux-2.6.24/drivers/input/keyboard/sharpsl_rc.c 2008-03-08 22:23:35.000000000 +0000 @@ -21,12 +21,10 @@ #include <linux/module.h> #include <linux/slab.h> @@ -96,11 +96,11 @@ Index: linux-2.6.24/drivers/input/keyboard/sharpsl_rc.c - reset_scoop_gpio(&REMOTE_SCOOP_DEVICE.dev, REMOTE_AKIN_PULLUP); - + if (machine_is_borzoi() || machine_is_spitz()) -+ reset_scoop_gpio(&platform_scoop_config->devs[1].dev, SPITZ_SCP2_AKIN_PULLUP); ++ reset_scoop_gpio(platform_scoop_config->devs[1].dev, SPITZ_SCP2_AKIN_PULLUP); + else if (machine_is_akita()) + akita_reset_ioexp(&akitaioexp_device.dev, AKITA_IOEXP_AKIN_PULLUP); + else -+ reset_scoop_gpio(&platform_scoop_config->devs[0].dev, CORGI_SCP_AKIN_PULLUP); ++ reset_scoop_gpio(platform_scoop_config->devs[0].dev, CORGI_SCP_AKIN_PULLUP); mod_timer(&data->rctimer, jiffies + msecs_to_jiffies(RC_POLL_MS)); } return IRQ_HANDLED; @@ -110,11 +110,11 @@ Index: linux-2.6.24/drivers/input/keyboard/sharpsl_rc.c } else { - set_scoop_gpio(&REMOTE_SCOOP_DEVICE.dev, REMOTE_AKIN_PULLUP); + if (machine_is_borzoi() || machine_is_spitz()) -+ set_scoop_gpio(&platform_scoop_config->devs[1].dev, SPITZ_SCP2_AKIN_PULLUP); ++ set_scoop_gpio(platform_scoop_config->devs[1].dev, SPITZ_SCP2_AKIN_PULLUP); + else if (machine_is_akita()) + akita_set_ioexp(&akitaioexp_device.dev, AKITA_IOEXP_AKIN_PULLUP); + else -+ set_scoop_gpio(&platform_scoop_config->devs[0].dev, CORGI_SCP_AKIN_PULLUP); ++ set_scoop_gpio(platform_scoop_config->devs[0].dev, CORGI_SCP_AKIN_PULLUP); data->handling_press = 0; } } |