Merge branch 'akpm'

* akpm:
  kernel/smp.c: consolidate writes in smp_call_function_interrupt()
  kernel/smp.c: fix smp_call_function_many() SMP race
  memcg: correctly order reading PCG_USED and pc->mem_cgroup
  backlight: fix 88pm860x_bl macro collision
  drivers/leds/ledtrig-gpio.c: make output match input, tighten input checking
  MAINTAINERS: update Atmel AT91 entry
  mm: fix truncate_setsize() comment
  memcg: fix rmdir, force_empty with THP
  memcg: fix LRU accounting with THP
  memcg: fix USED bit handling at uncharge in THP
  memcg: modify accounting function for supporting THP better
  fs/direct-io.c: don't try to allocate more than BIO_MAX_PAGES in a bio
  mm: compaction: prevent division-by-zero during user-requested compaction
  mm/vmscan.c: remove duplicate include of compaction.h
  memblock: fix memblock_is_region_memory()
  thp: keep highpte mapped until it is no longer needed
  kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index c1df7676a73d..b1682d7f1d8a 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -81,7 +81,7 @@ config SERIAL_8250_GSC
         default SERIAL_8250
 
 config SERIAL_8250_PCI
-        tristate "8250/16550 PCI device support" if EMBEDDED
+        tristate "8250/16550 PCI device support" if EXPERT
         depends on SERIAL_8250 && PCI
         default SERIAL_8250
         help
@@ -90,7 +90,7 @@ config SERIAL_8250_PCI
           Saves about 9K.
 
 config SERIAL_8250_PNP
-        tristate "8250/16550 PNP device support" if EMBEDDED
+        tristate "8250/16550 PNP device support" if EXPERT
         depends on SERIAL_8250 && PNP
         default SERIAL_8250
         help