git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-4.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
[sfrench/cifs-2.6.git]
/
include
/
linux
/
ioport.h
diff --git
a/include/linux/ioport.h
b/include/linux/ioport.h
index 6230064d7f95d072d61e2bc0eedd341463880d32..f5cf32e800411ecafd0aef552d7ae675dceefeb7 100644
(file)
--- a/
include/linux/ioport.h
+++ b/
include/linux/ioport.h
@@
-130,6
+130,8
@@
enum {
IORES_DESC_ACPI_NV_STORAGE = 3,
IORES_DESC_PERSISTENT_MEMORY = 4,
IORES_DESC_PERSISTENT_MEMORY_LEGACY = 5,
+ IORES_DESC_DEVICE_PRIVATE_MEMORY = 6,
+ IORES_DESC_DEVICE_PUBLIC_MEMORY = 7,
};
/* helpers to define resources */