[PATCH 1/6] xfree86: Purge kbdCustomKeycodes from xf86Info.

Peter Hutterer peter.hutterer at who-t.net
Tue Aug 3 21:36:37 PDT 2010


On Tue, Aug 03, 2010 at 06:21:28PM -0700, Jesse Adkins wrote:
> This was obsolete after 3eeb62e8f587732e6b433c2b9c6879eb26a3f1b4 "bug #890: completely remove deprecated keyboard driver".
> 
> Signed-off-by: Jesse Adkins <jesserayadkins at gmail.com>
> ---
>  hw/xfree86/common/xf86Globals.c |    1 -
>  hw/xfree86/common/xf86Privstr.h |    1 -
>  2 files changed, 0 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
> index 43665d1..2a3b978 100644
> --- a/hw/xfree86/common/xf86Globals.c
> +++ b/hw/xfree86/common/xf86Globals.c
> @@ -125,7 +125,6 @@ xf86InfoRec xf86Info = {
>  #endif
>      .pmFlag                     = TRUE,
>      .log                        = LogNone,
> -    .kbdCustomKeycodes          = FALSE,
>      .disableRandR               = FALSE,
>      .randRFrom                  = X_DEFAULT,
>  #if defined(CONFIG_HAL) || defined(CONFIG_UDEV)
> diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h
> index 39cd230..efe19e2 100644
> --- a/hw/xfree86/common/xf86Privstr.h
> +++ b/hw/xfree86/common/xf86Privstr.h
> @@ -96,7 +96,6 @@ typedef struct {
>  #endif
>      Bool		pmFlag;
>      Log			log;
> -    Bool		kbdCustomKeycodes;
>      Bool		disableRandR;
>      MessageType		randRFrom;
>      Bool		aiglx;
> -- 
> 1.7.0.4

I merged this one into my input -next branch, thanks. You can forget about
it now.


Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net> for the others,
though the free(pathcopy) needs indentation fixes (one tab, not spaces).
please keep this series around until the merge window opens.

Cheers,
  Peter


More information about the xorg-devel mailing list