diff options
Diffstat (limited to 'recipes/linux/linux-openmoko-2.6.32/0025-pcf50633-fix-merge.patch')
| -rw-r--r-- | recipes/linux/linux-openmoko-2.6.32/0025-pcf50633-fix-merge.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/recipes/linux/linux-openmoko-2.6.32/0025-pcf50633-fix-merge.patch b/recipes/linux/linux-openmoko-2.6.32/0025-pcf50633-fix-merge.patch deleted file mode 100644 index 612b332a94..0000000000 --- a/recipes/linux/linux-openmoko-2.6.32/0025-pcf50633-fix-merge.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 475d20cdb1bfefd32d5ed64dff745648df6311ed Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Mon, 26 Apr 2010 10:40:05 +0200 -Subject: [PATCH 25/31] pcf50633: fix merge - -from: http://git.openmoko.org/?p=kernel.git;a=blobdiff;f=arch/arm/mach-s3c2442/mach-gta02.c;h=a96903712cb0139133350d6443d9cee33f0397fd;hp=083b54c9bcf0b5311c29d38c976e3c6b04fe32d5;hb=8833244fb8a818a8429d686ba2b5626a1f2681bc;hpb=2f04ffc8dd97e15ce30358c3bf00cf6a0e7dcc19 ---- - arch/arm/mach-s3c2442/mach-gta02.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/arm/mach-s3c2442/mach-gta02.c b/arch/arm/mach-s3c2442/mach-gta02.c -index f1d4d51..8b59fa7 100644 ---- a/arch/arm/mach-s3c2442/mach-gta02.c -+++ b/arch/arm/mach-s3c2442/mach-gta02.c -@@ -631,8 +631,8 @@ struct pcf50633_platform_data gta02_pcf_pdata = { - .min_uV = 2000000, - .max_uV = 3300000, - .valid_modes_mask = REGULATOR_MODE_NORMAL, -- .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE | -- REGULATOR_CHANGE_VOLTAGE, -+ .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE | -+ REGULATOR_CHANGE_STATUS, - .always_on = 1, - }, - .num_consumer_supplies = ARRAY_SIZE(hcldo_consumers), --- -1.7.0.4 - |