Merge remote-tracking branch 'origin/master' into develop

keyboards/oddball/keymaps/default/rules.mk

@@ -1 +0,0 @@
-POINTING_DEVICE_DRIVER = adns9800

keyboards/oddball/readme.md

@@ -3,7 +3,7 @@
 A split keyboard with trackball support.
 
 * Keyboard Maintainer: [Alexander Tulloh](https://github.com/atulloh)
-* Hardware Supported: Oddball PCB and plates, and using an [ADNS9800](https://www.tindie.com/products/jkicklighter/adns-9800-laser-motion-sensor/) or a [PMW3360](https://www.tindie.com/products/jkicklighter/pmw3360-motion-sensor/) breakout board for mouse
+* Hardware Supported: Oddball PCB and plates, and using an [ADNS9800](https://www.tindie.com/products/jkicklighter/adns-9800-laser-motion-sensor/) (default) or a [PMW3360](https://www.tindie.com/products/jkicklighter/pmw3360-motion-sensor/) breakout board for mouse
 * Hardware Availability: [atulloh.github.io/oddball](https://atulloh.github.io/oddball)
 
 Make examples for this keyboard (after setting up your build environment):

keyboards/oddball/rules.mk

@@ -16,5 +16,6 @@ AUDIO_ENABLE = no           # Audio output
 
 SPLIT_KEYBOARD = yes
 POINTING_DEVICE_ENABLE = yes
+POINTING_DEVICE_DRIVER = adns9800
 
 DEFAULT_FOLDER = oddball/v1