diff --git a/examples/pashello/Makefile b/examples/pashello/Makefile
index cce7b526ed..aeb2200285 100644
--- a/examples/pashello/Makefile
+++ b/examples/pashello/Makefile
@@ -40,14 +40,8 @@ ifeq ($(WINTOOL),y)
 INCDIROPT	= -w
 endif
 
-COMPILER	= ${shell basename $(CC)}
-USRINCLUDES	= ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$CC" $(TOPDIR)/pcode/include $(TOPDIR)/pcode/insn/include}
-ifneq ($(ARCHSTDINCLUDES),)
-INCLUDES        = $(ARCHSTDINCLUDES) $(USRINCLUDES)
-else
-INCLUDES        = $(ARCHINCLUDES) $(USRINCLUDES)
-endif
-CFLAGS          = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(INCLUDES) $(ARCHDEFINES)
+CFLAGS	+= ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" $(TOPDIR)/pcode/include }
+CFLAGS	+= ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" $(TOPDIR)/pcode/insn/include}
 
 ASRCS	= 
 AOBJS	= $(ASRCS:.S=$(OBJEXT))
diff --git a/examples/pashello/device.c b/examples/pashello/device.c
index def8f60ecd..5f0038ad71 100644
--- a/examples/pashello/device.c
+++ b/examples/pashello/device.c
@@ -69,7 +69,9 @@ static const struct file_operations hello_fops =
   0,             /* write */
   0,             /* seek */
   0,             /* ioctl */
+#ifndef CONFIG_DISABLE_POLL
   0              /* poll */
+#endif
 };
 
 /****************************************************************************