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

This commit is contained in:
Gregory Nutt 2017-03-15 16:58:42 -06:00
commit 938f7341f2

View File

@ -85,8 +85,8 @@
#define _I2CBASE (0x2000) /* I2C driver commands */
#define _SPIBASE (0x2100) /* SPI driver commands */
#define _GPIOBASE (0x2200) /* GPIO driver commands */
#define _CLIOCBASE (0x1200) /* Contactless modules ioctl commands */
#define _MAC854BASE (0x2300) /* 802.15.4 device ioctl commands */
#define _CLIOCBASE (0x2300) /* Contactless modules ioctl commands */
#define _MAC854BASE (0x2400) /* 802.15.4 device ioctl commands */
/* boardctl() commands share the same number space */