Merge branch 'linus' into x86/nmi

[~andy/linux] / include / asm-v850 / rte_cb.h

diff --git a/include/asm-v850/rte_cb.h b/include/asm-v850/rte_cb.h
index 9f7f02cb039127e4045a5dc5fe4d278daa24ed61..db9879f00aa7b9adacca1a8b72a7f21126bdbb59 100644 (file)
--- a/include/asm-v850/rte_cb.h
+++ b/include/asm-v850/rte_cb.h
@@ -64,18 +64,11 @@
 /* As we don't really support PCI DMA to cpu memory, and use bounce-buffers
    instead, perversely enough, this becomes always true! */
 # define pci_dma_supported(dev, mask)          1
-# define pci_dac_dma_supported(dev, mask)      0
 # define pcibios_assign_all_busses()           1
 
 #endif /* CONFIG_RTE_MB_A_PCI */
 
 
-/* For <asm/param.h> */
-#ifndef HZ
-#define HZ     100
-#endif
-
-
 #ifndef __ASSEMBLY__
 extern void rte_cb_early_init (void);
 extern void rte_cb_init_irqs (void);