svn commit: r206325 - stable/8/sys/dev/usb/input

[Andrew Thompson]

Author: thompsa
Date: Tue Apr  6 23:30:57 2010
New Revision: 206325
URL: http://svn.freebsd.org/changeset/base/206325

Log:
  MFC r205804
  
   Do not swap Apple keys when detecting Apple-FN keyboards.
  
  Reported by:	Steven Noonan
  Submitted by:	Hans Petter Selasky

Modified:
  stable/8/sys/dev/usb/input/ukbd.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/dev/usb/input/ukbd.c
==============================================================================
--- stable/8/sys/dev/usb/input/ukbd.c	Tue Apr  6 23:30:30 2010	(r206324)
+++ stable/8/sys/dev/usb/input/ukbd.c	Tue Apr  6 23:30:57 2010	(r206325)
@@ -903,8 +903,7 @@ ukbd_attach(device_t dev)
 		    hid_input, 0, &sc->sc_loc_apple_fn, &flags,
 		    &temp_id)) {
 			if (flags & HIO_VARIABLE)
-				sc->sc_flags |= UKBD_FLAG_APPLE_FN |
-				    UKBD_FLAG_APPLE_SWAP;
+				sc->sc_flags |= UKBD_FLAG_APPLE_FN;
 			DPRINTFN(1, "Found Apple FN-key\n");
 			apple_keys = 1;
 			sc->sc_kbd_id = temp_id;