diff mbox

[1/2] UBUNTU: [Config] Unify CONFIG_INPUT_UINPUT

Message ID 1282125271.46078.516165539912.1.gpush@pororo
State Accepted
Delegated to: Leann Ogasawara
Headers show

Commit Message

Jeremy Kerr Aug. 18, 2010, 9:54 a.m. UTC
Currently, we define CONFIG_INPUT_UINPUT separately in each of the ports
configs.

This change removes the arch-specific definitions and replaces with one
in config.common.ports. This will only change sparc, which goes from not
set to =m.

Ignore: yes

Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com>

---
 debian.master/config/config.common.ports           |    1 +
 debian.master/config/ia64/config.common.ia64       |    1 -
 debian.master/config/powerpc/config.common.powerpc |    1 -
 debian.master/config/sparc/config.common.sparc     |    1 -
 4 files changed, 1 insertion(+), 3 deletions(-)

Comments

Tim Gardner Aug. 18, 2010, 1:03 p.m. UTC | #1
On 08/18/2010 03:54 AM, Jeremy Kerr wrote:
> Currently, we define CONFIG_INPUT_UINPUT separately in each of the ports
> configs.
>
> This change removes the arch-specific definitions and replaces with one
> in config.common.ports. This will only change sparc, which goes from not
> set to =m.
>
> Ignore: yes
>
> Signed-off-by: Jeremy Kerr<jeremy.kerr@canonical.com>
>
> ---
>   debian.master/config/config.common.ports           |    1 +
>   debian.master/config/ia64/config.common.ia64       |    1 -
>   debian.master/config/powerpc/config.common.powerpc |    1 -
>   debian.master/config/sparc/config.common.sparc     |    1 -
>   4 files changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/debian.master/config/config.common.ports b/debian.master/config/config.common.ports
> index 775f80c..a983a52 100644
> --- a/debian.master/config/config.common.ports
> +++ b/debian.master/config/config.common.ports
> @@ -1515,6 +1515,7 @@ CONFIG_INPUT_TWL4030_PWRBUTTON=m
>   CONFIG_INPUT_TWL4030_VIBRA=m
>   CONFIG_INPUT_WM831X_ON=m
>   CONFIG_INPUT_YEALINK=m
> +CONFIG_INPUT_UINPUT=m
>   CONFIG_IOMMU_API=y
>   CONFIG_IOMMU_HELPER=y
>   CONFIG_IOSAPIC=y
> diff --git a/debian.master/config/ia64/config.common.ia64 b/debian.master/config/ia64/config.common.ia64
> index a25b5ac..5a1836e 100644
> --- a/debian.master/config/ia64/config.common.ia64
> +++ b/debian.master/config/ia64/config.common.ia64
> @@ -119,7 +119,6 @@ CONFIG_INFINIBAND_QIB=m
>   CONFIG_INPUT_EVBUG=m
>   CONFIG_INPUT_JOYDEV=m
>   CONFIG_INPUT_JOYSTICK=y
> -CONFIG_INPUT_UINPUT=m
>   # CONFIG_IP1000 is not set
>   # CONFIG_IPMI_HANDLER is not set
>   # CONFIG_IPV6_PRIVACY is not set
> diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
> index 1cde1cb..f05b755 100644
> --- a/debian.master/config/powerpc/config.common.powerpc
> +++ b/debian.master/config/powerpc/config.common.powerpc
> @@ -107,7 +107,6 @@ CONFIG_INFTL=m
>   CONFIG_INPUT_EVBUG=m
>   CONFIG_INPUT_JOYDEV=m
>   CONFIG_INPUT_JOYSTICK=y
> -CONFIG_INPUT_UINPUT=m
>   CONFIG_IP1000=m
>   CONFIG_IPMI_HANDLER=m
>   CONFIG_IPMI_POWEROFF=m
> diff --git a/debian.master/config/sparc/config.common.sparc b/debian.master/config/sparc/config.common.sparc
> index 19e0a16..5a16dfc 100644
> --- a/debian.master/config/sparc/config.common.sparc
> +++ b/debian.master/config/sparc/config.common.sparc
> @@ -119,7 +119,6 @@ CONFIG_INFTL=m
>   # CONFIG_INPUT_EVBUG is not set
>   # CONFIG_INPUT_JOYDEV is not set
>   # CONFIG_INPUT_JOYSTICK is not set
> -# CONFIG_INPUT_UINPUT is not set
>   CONFIG_IP1000=m
>   CONFIG_IPMI_HANDLER=m
>   # CONFIG_IPMI_POWEROFF is not set
>

Since this patch is paired, and the second patch has a BugLink, one can 
infer that this is for Maverick from the bug report. A few words in the 
commit log would be nice, e.g., something about "this patch is in 
preparation for commonizing CONFIG_INPUT_UINPUT across all arches".

Acked-by: Tim Gardner <tim.gardner@canonical.com>?
Jeremy Kerr Aug. 19, 2010, 2:48 a.m. UTC | #2
Hi Tim,

> Since this patch is paired, and the second patch has a BugLink, one can 
> infer that this is for Maverick from the bug report.

Correct. Oversight on my behalf, sorry.

>  A few words in the 
> commit log would be nice, e.g., something about "this patch is in 
> preparation for commonizing CONFIG_INPUT_UINPUT across all arches".

Perhaps "in preparation for changing CONFIG_INPUT_UINPUT [...]"? - the
commonizing is done in this patch. Would you like a re-post?

Cheers,


Jeremy
Tim Gardner Aug. 19, 2010, 3:09 a.m. UTC | #3
On 08/18/2010 08:48 PM, Jeremy Kerr wrote:
> Hi Tim,
>
>> Since this patch is paired, and the second patch has a BugLink, one can
>> infer that this is for Maverick from the bug report.
>
> Correct. Oversight on my behalf, sorry.
>
>>   A few words in the
>> commit log would be nice, e.g., something about "this patch is in
>> preparation for commonizing CONFIG_INPUT_UINPUT across all arches".
>
> Perhaps "in preparation for changing CONFIG_INPUT_UINPUT [...]"? - the
> commonizing is done in this patch. Would you like a re-post?
>

No, I'm sure Leann can fix it up to her liking.
Leann Ogasawara Aug. 19, 2010, 11:57 p.m. UTC | #4
On Wed, 2010-08-18 at 17:54 +0800, Jeremy Kerr wrote:
> Currently, we define CONFIG_INPUT_UINPUT separately in each of the ports
> configs.
> 
> This change removes the arch-specific definitions and replaces with one
> in config.common.ports. This will only change sparc, which goes from not
> set to =m.
> 
> Ignore: yes
> 
> Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com>

Thanks for the patch.  By sheer coincidence we actually just made this
change as part of the patches that drop support for ia64 and sparc.  So,
I'll just apply patch 2/2 of this series.

Thanks,
Leann

> ---
>  debian.master/config/config.common.ports           |    1 +
>  debian.master/config/ia64/config.common.ia64       |    1 -
>  debian.master/config/powerpc/config.common.powerpc |    1 -
>  debian.master/config/sparc/config.common.sparc     |    1 -
>  4 files changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/debian.master/config/config.common.ports b/debian.master/config/config.common.ports
> index 775f80c..a983a52 100644
> --- a/debian.master/config/config.common.ports
> +++ b/debian.master/config/config.common.ports
> @@ -1515,6 +1515,7 @@ CONFIG_INPUT_TWL4030_PWRBUTTON=m
>  CONFIG_INPUT_TWL4030_VIBRA=m
>  CONFIG_INPUT_WM831X_ON=m
>  CONFIG_INPUT_YEALINK=m
> +CONFIG_INPUT_UINPUT=m
>  CONFIG_IOMMU_API=y
>  CONFIG_IOMMU_HELPER=y
>  CONFIG_IOSAPIC=y
> diff --git a/debian.master/config/ia64/config.common.ia64 b/debian.master/config/ia64/config.common.ia64
> index a25b5ac..5a1836e 100644
> --- a/debian.master/config/ia64/config.common.ia64
> +++ b/debian.master/config/ia64/config.common.ia64
> @@ -119,7 +119,6 @@ CONFIG_INFINIBAND_QIB=m
>  CONFIG_INPUT_EVBUG=m
>  CONFIG_INPUT_JOYDEV=m
>  CONFIG_INPUT_JOYSTICK=y
> -CONFIG_INPUT_UINPUT=m
>  # CONFIG_IP1000 is not set
>  # CONFIG_IPMI_HANDLER is not set
>  # CONFIG_IPV6_PRIVACY is not set
> diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
> index 1cde1cb..f05b755 100644
> --- a/debian.master/config/powerpc/config.common.powerpc
> +++ b/debian.master/config/powerpc/config.common.powerpc
> @@ -107,7 +107,6 @@ CONFIG_INFTL=m
>  CONFIG_INPUT_EVBUG=m
>  CONFIG_INPUT_JOYDEV=m
>  CONFIG_INPUT_JOYSTICK=y
> -CONFIG_INPUT_UINPUT=m
>  CONFIG_IP1000=m
>  CONFIG_IPMI_HANDLER=m
>  CONFIG_IPMI_POWEROFF=m
> diff --git a/debian.master/config/sparc/config.common.sparc b/debian.master/config/sparc/config.common.sparc
> index 19e0a16..5a16dfc 100644
> --- a/debian.master/config/sparc/config.common.sparc
> +++ b/debian.master/config/sparc/config.common.sparc
> @@ -119,7 +119,6 @@ CONFIG_INFTL=m
>  # CONFIG_INPUT_EVBUG is not set
>  # CONFIG_INPUT_JOYDEV is not set
>  # CONFIG_INPUT_JOYSTICK is not set
> -# CONFIG_INPUT_UINPUT is not set
>  CONFIG_IP1000=m
>  CONFIG_IPMI_HANDLER=m
>  # CONFIG_IPMI_POWEROFF is not set
>
diff mbox

Patch

diff --git a/debian.master/config/config.common.ports b/debian.master/config/config.common.ports
index 775f80c..a983a52 100644
--- a/debian.master/config/config.common.ports
+++ b/debian.master/config/config.common.ports
@@ -1515,6 +1515,7 @@  CONFIG_INPUT_TWL4030_PWRBUTTON=m
 CONFIG_INPUT_TWL4030_VIBRA=m
 CONFIG_INPUT_WM831X_ON=m
 CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_UINPUT=m
 CONFIG_IOMMU_API=y
 CONFIG_IOMMU_HELPER=y
 CONFIG_IOSAPIC=y
diff --git a/debian.master/config/ia64/config.common.ia64 b/debian.master/config/ia64/config.common.ia64
index a25b5ac..5a1836e 100644
--- a/debian.master/config/ia64/config.common.ia64
+++ b/debian.master/config/ia64/config.common.ia64
@@ -119,7 +119,6 @@  CONFIG_INFINIBAND_QIB=m
 CONFIG_INPUT_EVBUG=m
 CONFIG_INPUT_JOYDEV=m
 CONFIG_INPUT_JOYSTICK=y
-CONFIG_INPUT_UINPUT=m
 # CONFIG_IP1000 is not set
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_IPV6_PRIVACY is not set
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 1cde1cb..f05b755 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -107,7 +107,6 @@  CONFIG_INFTL=m
 CONFIG_INPUT_EVBUG=m
 CONFIG_INPUT_JOYDEV=m
 CONFIG_INPUT_JOYSTICK=y
-CONFIG_INPUT_UINPUT=m
 CONFIG_IP1000=m
 CONFIG_IPMI_HANDLER=m
 CONFIG_IPMI_POWEROFF=m
diff --git a/debian.master/config/sparc/config.common.sparc b/debian.master/config/sparc/config.common.sparc
index 19e0a16..5a16dfc 100644
--- a/debian.master/config/sparc/config.common.sparc
+++ b/debian.master/config/sparc/config.common.sparc
@@ -119,7 +119,6 @@  CONFIG_INFTL=m
 # CONFIG_INPUT_EVBUG is not set
 # CONFIG_INPUT_JOYDEV is not set
 # CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_UINPUT is not set
 CONFIG_IP1000=m
 CONFIG_IPMI_HANDLER=m
 # CONFIG_IPMI_POWEROFF is not set